use the updated state in case there is one

core/genesis.go

@@ -254,9 +254,9 @@ func (g *Genesis) ToBlock(db ethdb.Database) *types.Block {
 			statedb.SetState(addr, key, value)
 		}
 		//statedb.AddPreimage(crypto.Keccak256Hash((addr[:])), addr.Bytes()[:])
-		rawdb.WritePreimages(
+		_ = rawdb.WritePreimages(
 			statedb.Database().DiskDB(), map[ethCommon.Hash][]byte{
-				crypto.Keccak256Hash((addr.Bytes())): addr.Bytes(),
+				crypto.Keccak256Hash(addr.Bytes()): addr.Bytes(),
 			},
 		)
 	}

core/preimages.go

@@ -233,7 +233,12 @@ func GeneratePreimages(chain BlockChain, start, end uint64) error {
 		if err != nil {
 			return fmt.Errorf("error executing block #%d: %s", i, err)
 		}
-		startingState = endingState
+		stateAt, err := chain.StateAt(block.Root())
+		if err == nil && stateAt != nil {
+			startingState = stateAt
+		} else {
+			startingState = endingState
+		}
 	}
 	// force any pre-images in memory so far to go to disk, if they haven't already
 	fmt.Println("committing images")