rottenwheel/monero
1
0
Fork 0
mirror of https://codeberg.org/anoncontributorxmr/monero.git synced 2024-11-23 10:37:37 -07:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #5235

Browse Source 
c6a70af8 wallet2: key image import fixes (moneromooo-monero)
This commit is contained in:
Riccardo Spagni 2019-03-21 14:45:58 +02:00
commit 5e03bd06c1
No known key found for this signature in database
GPG Key ID: 55432DF31CCD4FCD
2 changed files with 19 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/simplewallet/simplewallet.cpp
View File

@ -8657,13 +8657,8 @@ bool simple_wallet::import_key_images(const std::vector<std::string> &args)
{ {
uint64_t spent = 0, unspent = 0; uint64_t spent = 0, unspent = 0;
uint64_t height = m_wallet->import_key_images(filename, spent, unspent); uint64_t height = m_wallet->import_key_images(filename, spent, unspent);
if (height > 0) success_msg_writer() << "Signed key images imported to height " << height << ", "
{ << print_money(spent) << " spent, " << print_money(unspent) << " unspent";
success_msg_writer() << "Signed key images imported to height " << height << ", "
<< print_money(spent) << " spent, " << print_money(unspent) << " unspent";
} else {
fail_msg_writer() << "Failed to import key images";
}
} }
catch (const std::exception &e) catch (const std::exception &e)
{ {

32
src/wallet/wallet2.cpp
View File

@ -11128,15 +11128,6 @@ crypto::public_key wallet2::get_tx_pub_key_from_received_outs(const tools::walle
size_t pk_index = 0; size_t pk_index = 0;
hw::device &hwdev = m_account.get_device(); hw::device &hwdev = m_account.get_device();
const std::vector<crypto::public_key> additional_tx_pub_keys = get_additional_tx_pub_keys_from_extra(td.m_tx);
std::vector<crypto::key_derivation> additional_derivations;
for (size_t i = 0; i < additional_tx_pub_keys.size(); ++i)
{
additional_derivations.push_back({});
bool r = hwdev.generate_key_derivation(additional_tx_pub_keys[i], keys.m_view_secret_key, additional_derivations.back());
THROW_WALLET_EXCEPTION_IF(!r, error::wallet_internal_error, "Failed to generate key derivation");
}
while (find_tx_extra_field_by_type(tx_extra_fields, pub_key_field, pk_index++)) { while (find_tx_extra_field_by_type(tx_extra_fields, pub_key_field, pk_index++)) {
const crypto::public_key tx_pub_key = pub_key_field.pub_key; const crypto::public_key tx_pub_key = pub_key_field.pub_key;
crypto::key_derivation derivation; crypto::key_derivation derivation;
@ -11146,16 +11137,15 @@ crypto::public_key wallet2::get_tx_pub_key_from_received_outs(const tools::walle
for (size_t i = 0; i < td.m_tx.vout.size(); ++i) for (size_t i = 0; i < td.m_tx.vout.size(); ++i)
{ {
tx_scan_info_t tx_scan_info; tx_scan_info_t tx_scan_info;
check_acc_out_precomp(td.m_tx.vout[i], derivation, additional_derivations, i, tx_scan_info); check_acc_out_precomp(td.m_tx.vout[i], derivation, {}, i, tx_scan_info);
if (!tx_scan_info.error && tx_scan_info.received) if (!tx_scan_info.error && tx_scan_info.received)
return tx_pub_key; return tx_pub_key;
} }
} }
// we found no key yielding an output // we found no key yielding an output, but it might be in the additional
THROW_WALLET_EXCEPTION_IF(true, error::wallet_internal_error, // tx pub keys only, which we do not need to check, so return the first one
"Public key yielding at least one output wasn't found in the transaction extra"); return tx_pub_key;
return crypto::null_pkey;
} }
bool wallet2::export_key_images(const std::string &filename) const bool wallet2::export_key_images(const std::string &filename) const
@ -11397,6 +11387,17 @@ uint64_t wallet2::import_key_images(const std::vector<std::pair<crypto::key_imag
} }
PERF_TIMER_STOP(import_key_images_C); PERF_TIMER_STOP(import_key_images_C);
// accumulate outputs before the updated data
for(size_t i = 0; i < offset; ++i)
{
const transfer_details &td = m_transfers[i];
uint64_t amount = td.amount();
if (td.m_spent)
spent += amount;
else
unspent += amount;
}
PERF_TIMER_START(import_key_images_D); PERF_TIMER_START(import_key_images_D);
for(size_t i = 0; i < signed_key_images.size(); ++i) for(size_t i = 0; i < signed_key_images.size(); ++i)
{ {
@ -11560,7 +11561,8 @@ uint64_t wallet2::import_key_images(const std::vector<std::pair<crypto::key_imag
PERF_TIMER_STOP(import_key_images_G); PERF_TIMER_STOP(import_key_images_G);
} }
return m_transfers[signed_key_images.size() - 1].m_block_height; // this can be 0 if we do not know the height
return m_transfers[signed_key_images.size() + offset - 1].m_block_height;
} }
bool wallet2::import_key_images(std::vector<crypto::key_image> key_images, size_t offset, boost::optional<std::unordered_set<size_t>> selected_transfers) bool wallet2::import_key_images(std::vector<crypto::key_image> key_images, size_t offset, boost::optional<std::unordered_set<size_t>> selected_transfers)