adding equal methods to block and transactions
merge conflict
fixing transaction and block validation