diff options
| author | Riccardo Spagni <ric@spagni.net> | 2015-08-10 20:02:36 +0200 |
|---|---|---|
| committer | Riccardo Spagni <ric@spagni.net> | 2015-08-10 20:02:38 +0200 |
| commit | ef15e909f5f935e84d5e4c867b99a6bee59db63f (patch) | |
| tree | 6199ee504482abac3b764c4018b614a8339c8de7 /src/cryptonote_core/account.h | |
| parent | Merge pull request #359 (diff) | |
| parent | encrypted payment ids are now 64 bit, instead of 256 bit (diff) | |
| download | monero-ef15e909f5f935e84d5e4c867b99a6bee59db63f.tar.xz | |
Merge pull request #361
a2d7a5f encrypted payment ids are now 64 bit, instead of 256 bit (moneromooo-monero)
e40cfc4 Encrypted payment IDs (moneromooo-monero)
Diffstat (limited to 'src/cryptonote_core/account.h')
| -rw-r--r-- | src/cryptonote_core/account.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/cryptonote_core/account.h b/src/cryptonote_core/account.h index 088363bf1..732645ee4 100644 --- a/src/cryptonote_core/account.h +++ b/src/cryptonote_core/account.h @@ -61,7 +61,7 @@ namespace cryptonote void create_from_viewkey(const cryptonote::account_public_address& address, const crypto::secret_key& viewkey); const account_keys& get_keys() const; std::string get_public_address_str(bool testnet) const; - std::string get_public_integrated_address_str(const crypto::hash &payment_id, bool testnet) const; + std::string get_public_integrated_address_str(const crypto::hash8 &payment_id, bool testnet) const; uint64_t get_createtime() const { return m_creation_timestamp; } void set_createtime(uint64_t val) { m_creation_timestamp = val; } |