This is a preparation for BIP143 support. Edited for Zcash merge by Ariel Gabizon.
Signed-off-by: Daira Hopwood <daira@jacaranda.org>
Closes #1563