Cosmos-sdk is working on implementing a canonical json representation of their protobuf data to generate signature.
cosmos/cosmos-sdk@9d49fe9
We should wait and reuse the same system to generate deterministic hashes for our resources.
In the meantime, we should revert #1692 to not break anything now.