aboutsummaryrefslogtreecommitdiff
path: root/src/cryptonote_core/account.cpp
diff options
context:
space:
mode:
authorRiccardo Spagni <ric@spagni.net>2015-08-10 20:02:36 +0200
committerRiccardo Spagni <ric@spagni.net>2015-08-10 20:02:38 +0200
commitef15e909f5f935e84d5e4c867b99a6bee59db63f (patch)
tree6199ee504482abac3b764c4018b614a8339c8de7 /src/cryptonote_core/account.cpp
parent9c1ecc63573db42743b53a67d58f43007289738b (diff)
parenta2d7a5fb49dedd6c7e024701eefc4c0beade1edd (diff)
downloadmonzero-core-ef15e909f5f935e84d5e4c867b99a6bee59db63f.tar.gz
monzero-core-ef15e909f5f935e84d5e4c867b99a6bee59db63f.tar.xz
monzero-core-ef15e909f5f935e84d5e4c867b99a6bee59db63f.zip
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.cpp')
-rw-r--r--src/cryptonote_core/account.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/cryptonote_core/account.cpp b/src/cryptonote_core/account.cpp
index eb79f5949..fe8dbd1e8 100644
--- a/src/cryptonote_core/account.cpp
+++ b/src/cryptonote_core/account.cpp
@@ -120,7 +120,7 @@ DISABLE_VS_WARNINGS(4244 4345)
return get_account_address_as_str(testnet, m_keys.m_account_address);
}
//-----------------------------------------------------------------
- std::string account_base::get_public_integrated_address_str(const crypto::hash &payment_id, bool testnet) const
+ std::string account_base::get_public_integrated_address_str(const crypto::hash8 &payment_id, bool testnet) const
{
//TODO: change this code into base 58
return get_account_integrated_address_as_str(testnet, m_keys.m_account_address, payment_id);