fix pubkeyhash_to_pubkey errs thrown when P2SH addresses are used.
fix pubkeyhash_to_pubkey errs thrown when P2SH addresses are used.

monaparty/counterparty-lib,monaparty/counterparty-lib,F483/counterparty-lib,F483/counterparty-lib,CounterpartyXCP/counterparty-lib,CounterpartyXCP/counterparty-lib