Feature/refactor rpc txs