Geth v1.13.2

core/state/statedb.go

@@ -1019,7 +1019,7 @@ func (s *StateDB) clearJournalAndRefund() {
 // storage iteration and constructs trie node deletion markers by creating
 // stack trie with iterated slots.
 func (s *StateDB) fastDeleteStorage(addrHash common.Hash, root common.Hash) (bool, common.StorageSize, map[common.Hash][]byte, *trienode.NodeSet, error) {
-	iter, _ := s.snap.StorageIterator(addrHash, common.Hash{}) // XXX
+	iter, _ := s.snap.StorageIterator(addrHash, common.Hash{})
 	defer iter.Release()
 
 	var (

core/state/statedb_test.go

@@ -1165,7 +1165,7 @@ func TestDeleteStorage(t *testing.T) {
 		value := common.Hash(uint256.NewInt(uint64(10 * i)).Bytes32())
 		state.SetState(addr, slot, value)
 	}
-	root, _ := state.Commit(0, true, false)
+	root, _ := state.CommitWithSnap(0, true, snaps, common.Hash{}, common.Hash{}, false)
 	// Init phase done, create two states, one with snap and one without
 	fastState, _ := New(root, db, snaps)
 	slowState, _ := New(root, db, nil)

plugin/evm/config.go

@@ -204,10 +204,12 @@ type Config struct {
 	// on RPC nodes.
 	AcceptedCacheSize int `json:"accepted-cache-size"`
 
-	// TxLookupLimit is the maximum number of blocks from head whose tx indices
+	// TransactionHistory is the maximum number of blocks from head whose tx indices
 	// are reserved:
 	//  * 0:   means no limit
 	//  * N:   means N block limit [HEAD-N+1, HEAD] and delete extra indexes
+	TransactionHistory uint64 `json:"transaction-history"`
+	// Deprecated, use 'TransactionHistory' instead.
 	TxLookupLimit uint64 `json:"tx-lookup-limit"`
 
 	// SkipTxIndexing skips indexing transactions.
@@ -319,3 +321,14 @@ func (c *Config) Validate() error {
 
 	return nil
 }
+
+func (c *Config) Deprecate() string {
+	msg := ""
+	// Deprecate the old config options and set the new ones.
+	if c.TxLookupLimit != 0 {
+		msg += "tx-lookup-limit is deprecated, use transaction-history instead. "
+		c.TransactionHistory = c.TxLookupLimit
+	}
+
+	return msg
+}

plugin/evm/vm.go

@@ -271,6 +271,11 @@ func (vm *VM) Initialize(
 	if err := vm.config.Validate(); err != nil {
 		return err
 	}
+	// We should deprecate config flags as the first thing, before we do anything else
+	// because this can set old flags to new flags. log the message after we have
+	// initialized the logger.
+	deprecateMsg := vm.config.Deprecate()
+
 	vm.ctx = chainCtx
 
 	// Create logger
@@ -288,6 +293,10 @@ func (vm *VM) Initialize(
 
 	log.Info("Initializing Subnet EVM VM", "Version", Version, "Config", vm.config)
 
+	if deprecateMsg != "" {
+		log.Warn("Deprecation Warning", "msg", deprecateMsg)
+	}
+
 	if len(fxs) > 0 {
 		return errUnsupportedFXs
 	}

trie/triedb/hashdb/database.go

@@ -736,7 +736,6 @@ func (db *Database) Size() (common.StorageSize, common.StorageSize) {
 func (db *Database) Close() error {
 	if db.cleans != nil {
 		db.cleans.Reset()
-		db.cleans = nil
 	}
 	return nil
 }