stash

Author: rjl493456442

cmd/utils/flags.go

@@ -270,9 +270,9 @@ var (
 		Usage:    "Scheme to use for storing ethereum state ('hash' or 'path')",
 		Category: flags.StateCategory,
 	}
-	StateHistoryFlag = &cli.Int64Flag{
+	StateHistoryFlag = &cli.Uint64Flag{
 		Name:     "history.state",
-		Usage:    "Number of recent blocks to retain state history for, only relevant in state.scheme=path (default = 90,000 blocks, 0 = entire chain, -1 = disabled)",
+		Usage:    "Number of recent blocks to retain state history for, only relevant in state.scheme=path (default = 90,000 blocks, 0 = entire chain)",
 		Value:    ethconfig.Defaults.StateHistory,
 		Category: flags.StateCategory,
 	}
@@ -1639,7 +1639,7 @@ func SetEthConfig(ctx *cli.Context, stack *node.Node, cfg *ethconfig.Config) {
 		log.Info("Enabling recording of key preimages since archive mode is used")
 	}
 	if ctx.IsSet(StateHistoryFlag.Name) {
-		cfg.StateHistory = ctx.Int64(StateHistoryFlag.Name)
+		cfg.StateHistory = ctx.Uint64(StateHistoryFlag.Name)
 	}
 	if ctx.IsSet(StateSchemeFlag.Name) {
 		cfg.StateScheme = ctx.String(StateSchemeFlag.Name)
@@ -2199,8 +2199,7 @@ func MakeChain(ctx *cli.Context, stack *node.Node, readonly bool) (*core.BlockCh
 		SnapshotLimit:  ethconfig.Defaults.SnapshotCache,
 		Preimages:      ctx.Bool(CachePreimagesFlag.Name),
 		StateScheme:    scheme,
-		StateHistory:   ctx.Int64(StateHistoryFlag.Name),
-
+		StateHistory:   ctx.Uint64(StateHistoryFlag.Name),
 		// Disable transaction indexing/unindexing.
 		TxLookupLimit: -1,
 

core/blockchain.go

@@ -174,8 +174,7 @@ type BlockChainConfig struct {
 
 	// Number of blocks from the chain head for which state histories are retained.
 	// If set to 0, all state histories across the entire chain will be retained;
-	// If set to -1, no state history will be retained;
-	StateHistory int64
+	StateHistory uint64
 
 	// State snapshot related options
 	SnapshotLimit   int  // Memory allowance (MB) to use for caching snapshot entries in memory

eth/ethconfig/config.go

@@ -103,7 +103,7 @@ type Config struct {
 	LogHistory           uint64 `toml:",omitempty"` // The maximum number of blocks from head where a log search index is maintained.
 	LogNoHistory         bool   `toml:",omitempty"` // No log search index is maintained.
 	LogExportCheckpoints string // export log index checkpoints to file
-	StateHistory         int64  `toml:",omitempty"` // The maximum number of blocks from head whose state histories are reserved.
+	StateHistory         uint64 `toml:",omitempty"` // The maximum number of blocks from head whose state histories are reserved.
 
 	// State scheme represents the scheme used to store ethereum states and trie
 	// nodes on top. It can be 'hash', 'path', or none which means use the scheme

eth/ethconfig/gen_config.go

@@ -70,8 +70,8 @@ var ReadOnly = &Config{
 // Config contains the settings for database.
 type Config struct {
 	// Number of recent blocks to maintain state history for.
-	// 0: full chain, -1: disabled.
-	StateHistory int64
+	// 0: full chain
+	StateHistory uint64
 
 	// Number of recent blocks to maintain trienode history for.
 	// 0: full chain, -1: disabled.
@@ -111,12 +111,10 @@ func (c *Config) fields() []interface{} {
 	list = append(list, "statecache", common.StorageSize(c.StateCleanSize))
 	list = append(list, "buffer", common.StorageSize(c.WriteBufferSize))
 
-	if c.StateHistory >= 0 {
-		if c.StateHistory == 0 {
-			list = append(list, "state-history", "entire chain")
-		} else {
-			list = append(list, "state-history", fmt.Sprintf("last %d blocks", c.StateHistory))
-		}
+	if c.StateHistory == 0 {
+		list = append(list, "state-history", "entire chain")
+	} else {
+		list = append(list, "state-history", fmt.Sprintf("last %d blocks", c.StateHistory))
 	}
 	if c.TrienodeHistory >= 0 {
 		if c.TrienodeHistory == 0 {

triedb/pathdb/config.go

@@ -201,9 +201,6 @@ func New(diskdb ethdb.Database, config *Config, isVerkle bool) *Database {
 // repairHistory truncates leftover state history objects, which may occur due
 // to an unclean shutdown or other unexpected reasons.
 func (db *Database) repairHistory() error {
-	if db.config.StateHistory < 0 {
-		return nil
-	}
 	// Open the freezer for state history. This mechanism ensures that
 	// only one database instance can be opened at a time to prevent
 	// accidental mutation.

triedb/pathdb/database.go

@@ -136,7 +136,7 @@ type tester struct {
 }
 
 type testerConfig struct {
-	stateHistory    int64
+	stateHistory    uint64
 	trienodeHistory int64
 	isVerkle        bool
 	layers          int

triedb/pathdb/database_test.go

@@ -350,7 +350,7 @@ func (dl *diskLayer) commit(bottom *diffLayer, force bool) (*diskLayer, error) {
 		if err != nil {
 			return nil, err
 		}
-		limit := uint64(dl.db.config.StateHistory)
+		limit := dl.db.config.StateHistory
 		if limit != 0 && bottom.stateID()-tail > limit {
 			overflow = true
 			oldest = bottom.stateID() - limit + 1 // track the id of history **after truncation**

triedb/pathdb/disklayer.go

@@ -119,7 +119,7 @@ func TestHistoryReader(t *testing.T) {
 	testHistoryReader(t, 10) // with latest 10 histories reserved
 }
 
-func testHistoryReader(t *testing.T, historyLimit int64) {
+func testHistoryReader(t *testing.T, historyLimit uint64) {
 	maxDiffLayers = 4
 	defer func() {
 		maxDiffLayers = 128