more changes in blockchain refactor