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/cryptonote_basic_impl.cpp | |
| parent | 9c1ecc63573db42743b53a67d58f43007289738b (diff) | |
| parent | a2d7a5fb49dedd6c7e024701eefc4c0beade1edd (diff) | |
| download | monzero-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/cryptonote_basic_impl.cpp')
| -rw-r--r-- | src/cryptonote_core/cryptonote_basic_impl.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/cryptonote_core/cryptonote_basic_impl.cpp b/src/cryptonote_core/cryptonote_basic_impl.cpp index 1319a2ef9..bd0b8a304 100644 --- a/src/cryptonote_core/cryptonote_basic_impl.cpp +++ b/src/cryptonote_core/cryptonote_basic_impl.cpp @@ -46,7 +46,7 @@ namespace cryptonote { struct integrated_address { account_public_address adr; - crypto::hash payment_id; + crypto::hash8 payment_id; BEGIN_SERIALIZE_OBJECT() FIELD(adr) @@ -150,7 +150,7 @@ namespace cryptonote { std::string get_account_integrated_address_as_str( bool testnet , account_public_address const & adr - , crypto::hash const & payment_id + , crypto::hash8 const & payment_id ) { uint64_t integrated_address_prefix = testnet ? @@ -176,7 +176,7 @@ namespace cryptonote { bool get_account_integrated_address_from_str( account_public_address& adr , bool& has_payment_id - , crypto::hash& payment_id + , crypto::hash8& payment_id , bool testnet , std::string const & str ) @@ -278,7 +278,7 @@ namespace cryptonote { ) { bool has_payment_id; - crypto::hash payment_id; + crypto::hash8 payment_id; return get_account_integrated_address_from_str(adr, has_payment_id, payment_id, testnet, str); } |