Changes based on PR comments

core/blockchain.go

@@ -97,11 +97,10 @@ var (
 )
 
 const (
-	bodyCacheLimit       = 256
-	blockCacheLimit      = 256
-	receiptsCacheLimit   = 32
-	txLookupCacheLimit   = 1024
-	DefaultTriesInMemory = 128
+	bodyCacheLimit     = 256
+	blockCacheLimit    = 256
+	receiptsCacheLimit = 32
+	txLookupCacheLimit = 1024
 
 	// BlockChainVersion ensures that an incompatible database forces a resync from scratch.
 	//
@@ -186,7 +185,7 @@ func (c *CacheConfig) triedbConfig(isVerkle bool) *triedb.Config {
 var defaultCacheConfig = &CacheConfig{
 
 	// Arbitrum Config Options
-	TriesInMemory:                      DefaultTriesInMemory,
+	TriesInMemory:                      state.DefaultTriesInMemory,
 	TrieRetention:                      30 * time.Minute,
 	MaxNumberOfBlocksToSkipStateSaving: 0,
 	MaxAmountOfGasToSkipStateSaving:    0,

core/state/statedb.go

@@ -43,7 +43,7 @@ import (
 )
 
 // TriesInMemory represents the number of layers that are kept in RAM.
-const TriesInMemory = 128
+const DefaultTriesInMemory = 128
 
 type revision struct {
 	id           int
@@ -1374,8 +1374,8 @@ func (s *StateDB) Commit(block uint64, deleteEmptyObjects bool) (common.Hash, er
 			// - head layer is paired with HEAD state
 			// - head-1 layer is paired with HEAD-1 state
 			// - head-127 layer(bottom-most diff layer) is paired with HEAD-127 state
-			if err := s.snaps.Cap(root, TriesInMemory); err != nil {
-				log.Warn("Failed to cap snapshot tree", "root", root, "layers", TriesInMemory, "err", err)
+			if err := s.snaps.Cap(root, DefaultTriesInMemory); err != nil {
+				log.Warn("Failed to cap snapshot tree", "root", root, "layers", DefaultTriesInMemory, "err", err)
 			}
 		}
 		s.SnapshotCommits += time.Since(start)

core/state_transition.go

@@ -524,6 +524,7 @@ func (st *StateTransition) TransitionDb() (*ExecutionResult, error) {
 		fee := new(uint256.Int).SetUint64(st.gasUsed())
 		fee.Mul(fee, effectiveTipU256)
 		st.state.AddBalance(st.evm.Context.Coinbase, fee, tracing.BalanceIncreaseRewardTransactionFee)
+		tipAmount = fee.ToBig()
 	}
 
 	// Arbitrum: record the tip