Update submodules
Remove downstream merge warnings
Revert transaction id calculation change to remain consistent with block
id calculation