Fix Orphaned + Race condition when updating tx block indexes