**Describe the Issue** https://github.com/zeta-chain/node/pull/2321 introduces `TODO(revamp)` for several ZetaClient improvement that can be addressed as a chunk in a PR This issue is about addressing these comments There 80 tracked TODOs