dataservice: refactor transactionDS in progress