When integrating the new keystore a lot of the address computation functions became outdated and weird to use. It should all be refactored and CompleteAddress should be "re-thought" because it's content is no longer sufficient to derive contract address. Should it contain publicKeysHash instead of public key? Or should it contain preimage of the public keys hash?