execution, db: bind cache views to state versions and file views

cmd/integration/commands/stages.go

@@ -844,7 +844,7 @@ func execBlocksBatch(ctx context.Context, db kv.TemporalRwDB, st *stagedsync.Syn
 	}
 	defer doms.Close()
 	doms.SetInMemHistoryReads(false)
-	doms.SetStateCache(stateCache)
+	doms.SetCanonicalStateCache(stateCache)
 	doms.SetCodeStore(codeStore)
 	execctx.GuardAggregatorForCache(db, stateCache)
 

db/state/execctx/codehash_routing_test.go

@@ -45,7 +45,7 @@ func TestCodeHashForAddr_InBatchAccountWinsOverStaleLRU(t *testing.T) {
 	}
 	var staleArr [32]byte
 	copy(staleArr[:], stale[:])
-	sc.View(frontierAt(0)).SeedAddrCodeHash(addr[:], staleArr, 0)
+	currentStateCacheView(t, sc).SeedAddrCodeHash(addr[:], staleArr)
 
 	t.Run("empty in-batch account wins (codeHash-no-code repro)", func(t *testing.T) {
 		acc := accounts.Account{Nonce: 7, CodeHash: accounts.EmptyCodeHash}
@@ -69,13 +69,9 @@ func TestCodeHashForAddr_InBatchAccountWinsOverStaleLRU(t *testing.T) {
 	})
 }
 
-// The addr→codeHash admission gate vouches for the tx read view's frontier, but
-// resolve() may serve the account record from the shared accounts cache, which
-// lags a just-committed flush until the apply loop reaches the key. A
-// cache-sourced record must therefore never seed the mapping — an apply
-// interleaved between the read and the fill would leave a mapping derived from
-// the pre-apply record.
-func TestCodeHashForAddr_CacheSourcedRecordDoesNotSeedMapping(t *testing.T) {
+// A generation-bound account-cache hit can safely seed the derived mapping:
+// publication revokes the view before changing either cache layer.
+func TestCodeHashForAddr_CacheSourcedRecordSeedsMapping(t *testing.T) {
 	t.Parallel()
 
 	ctx := t.Context()
@@ -103,9 +99,9 @@ func TestCodeHashForAddr_CacheSourcedRecordDoesNotSeedMapping(t *testing.T) {
 	require.NoError(t, seedSD.Commit(ctx, seedTx))
 	seedSD.Close()
 
-	_, ok := sc.View(nil).Get(kv.AccountsDomain, addr[:])
+	_, ok := currentStateCacheView(t, sc).Get(kv.AccountsDomain, addr[:])
 	require.True(t, ok, "the committed record must be served by the accounts cache")
-	_, ok = sc.View(nil).GetAddrCodeHash(addr[:])
+	_, ok = currentStateCacheView(t, sc).GetAddrCodeHash(addr[:])
 	require.False(t, ok, "the post-commit apply must leave the derived mapping empty")
 
 	roTx, err := db.BeginTemporalRo(ctx)
@@ -118,8 +114,9 @@ func TestCodeHashForAddr_CacheSourcedRecordDoesNotSeedMapping(t *testing.T) {
 
 	got := sd.CodeHashForAddr(roTx, addr[:], 20)
 	require.Equal(t, codeHash[:], got)
-	_, ok = sc.View(nil).GetAddrCodeHash(addr[:])
-	require.False(t, ok, "a cache-sourced account record must not seed the addr→codeHash mapping")
+	h, ok := currentStateCacheView(t, sc).GetAddrCodeHash(addr[:])
+	require.True(t, ok)
+	require.Equal(t, [32]byte(codeHash), h)
 }
 
 // A record read from the tx's read view (accounts-cache miss) is exactly what
@@ -163,7 +160,7 @@ func TestCodeHashForAddr_ViewSourcedRecordSeedsMapping(t *testing.T) {
 
 	got := sd.CodeHashForAddr(roTx, addr[:], 20)
 	require.Equal(t, codeHash[:], got)
-	h, ok := sc.View(nil).GetAddrCodeHash(addr[:])
+	h, ok := currentStateCacheView(t, sc).GetAddrCodeHash(addr[:])
 	require.True(t, ok, "a view-sourced record must seed the mapping")
 	require.Equal(t, [32]byte(codeHash), h)
 }