commit oldest in-memory trie on shutdown

Author: tsahee

core/blockchain.go

@@ -21,6 +21,7 @@ import (
 	"errors"
 	"fmt"
 	"io"
+	"math"
 	"math/big"
 	"sort"
 	"sync"
@@ -883,9 +884,15 @@ func (bc *BlockChain) Stop() {
 	if !bc.cacheConfig.TrieDirtyDisabled {
 		triedb := bc.stateCache.TrieDB()
 
-		for _, offset := range []uint64{0, 1, bc.cacheConfig.TriesInMemory - 1} {
+		for _, offset := range []uint64{0, 1, math.MaxUint64} {
 			if number := bc.CurrentBlock().NumberU64(); number > offset {
-				recent := bc.GetBlockByNumber(number - offset)
+				var recent *types.Block
+				if offset == math.MaxUint {
+					_, latest := bc.triegc.Peek()
+					recent = bc.GetBlockByNumber(uint64(-latest))
+				} else {
+					recent = bc.GetBlockByNumber(number - offset)
+				}
 				if recent.Root() == (common.Hash{}) {
 					continue
 				}