Use the BlockHeight type wherever it makes sense
#2129
Merged
BlockHeight type wherever it makes sense
#2129