Move tx hash fix into its own file