refactor blockchain service
resolve merge
refactor