aboutsummaryrefslogtreecommitdiff
path: root/src/wallet/wallet2.h
diff options
context:
space:
mode:
authorRiccardo Spagni <ric@spagni.net>2017-01-13 14:34:26 -0500
committerRiccardo Spagni <ric@spagni.net>2017-01-13 14:34:26 -0500
commite51afeb90f8da263d1a62875fd387379ca87c838 (patch)
treee98728d38afb809fb6b49a66704301e34b9e2904 /src/wallet/wallet2.h
parentMerge pull request #1538 (diff)
parentCold signing: make sure short payment id isnt encrypted twice (diff)
downloadmonero-e51afeb90f8da263d1a62875fd387379ca87c838.tar.xz
Merge pull request #1540
79b4e1f9 Cold signing: make sure short payment id isnt encrypted twice (Jaquee)
Diffstat (limited to 'src/wallet/wallet2.h')
-rw-r--r--src/wallet/wallet2.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/src/wallet/wallet2.h b/src/wallet/wallet2.h
index 37609cd2f..2d4896b55 100644
--- a/src/wallet/wallet2.h
+++ b/src/wallet/wallet2.h
@@ -579,6 +579,7 @@ namespace tools
void check_genesis(const crypto::hash& genesis_hash) const; //throws
bool generate_chacha8_key_from_secret_keys(crypto::chacha8_key &key) const;
crypto::hash get_payment_id(const pending_tx &ptx) const;
+ crypto::hash8 get_short_payment_id(const pending_tx &ptx) const;
void check_acc_out_precomp(const crypto::public_key &spend_public_key, const cryptonote::tx_out &o, const crypto::key_derivation &derivation, size_t i, bool &received, uint64_t &money_transfered, bool &error) const;
void parse_block_round(const cryptonote::blobdata &blob, cryptonote::block &bl, crypto::hash &bl_id, bool &error) const;
uint64_t get_upper_tranaction_size_limit();