aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorJaquee <jaquee.monero@gmail.com>2017-10-15 18:55:33 +0200
committerJaquee <jaquee.monero@gmail.com>2017-10-15 19:19:40 +0200
commit3492de010b51fe1192c5f1c2cfa6e069d255604a (patch)
treef6ea5b2fd275d7bc0d60a441084e98ab49b72f6c /src
parentremove reference to cryptonote::null_hash (diff)
downloadmonero-3492de010b51fe1192c5f1c2cfa6e069d255604a.tar.xz
fix lightwallet and subaddresses conflict
Diffstat (limited to 'src')
-rw-r--r--src/wallet/wallet2.cpp7
1 files changed, 6 insertions, 1 deletions
diff --git a/src/wallet/wallet2.cpp b/src/wallet/wallet2.cpp
index f316b5d1d..cc0e9e7e2 100644
--- a/src/wallet/wallet2.cpp
+++ b/src/wallet/wallet2.cpp
@@ -5324,7 +5324,12 @@ bool wallet2::light_wallet_key_image_is_ours(const crypto::key_image& key_image,
// Not in cache - calculate key image
crypto::key_image calculated_key_image;
cryptonote::keypair in_ephemeral;
- cryptonote::generate_key_image_helper(get_account().get_keys(), tx_public_key, out_index, in_ephemeral, calculated_key_image);
+
+ // Subaddresses aren't supported in mymonero/openmonero yet. Using empty values.
+ const std::vector<crypto::public_key> additional_tx_pub_keys;
+ const crypto::public_key pkey = crypto::null_pkey;
+
+ cryptonote::generate_key_image_helper(get_account().get_keys(), m_subaddresses, pkey, tx_public_key, additional_tx_pub_keys, out_index, in_ephemeral, calculated_key_image);
index_keyimage_map.emplace(out_index, calculated_key_image);
m_key_image_cache.emplace(tx_public_key, index_keyimage_map);
return key_image == calculated_key_image;