rottenwheel/monero
1
0
Fork 0
mirror of https://codeberg.org/anoncontributorxmr/monero.git synced 2024-11-29 18:53:14 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #8615

Browse source 
85c9fe5 wallet2: fix create view-only wallet from existing wallet (j-berman)
This commit is contained in:
luigi1111 2022-12-01 01:06:16 -06:00
commit cce309512c
No known key found for this signature in database
GPG key ID: F4ACA0183641E010
2 changed files with 4 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/wallet/api/wallet.cpp
View file

@ -535,7 +535,7 @@ bool WalletImpl::createWatchOnly(const std::string &path, const std::string &pas
view_wallet->generate(path, password, address, viewkey); view_wallet->generate(path, password, address, viewkey);
// Export/Import outputs // Export/Import outputs
auto outputs = m_wallet->export_outputs(); auto outputs = m_wallet->export_outputs(true/*all*/);
view_wallet->import_outputs(outputs); view_wallet->import_outputs(outputs);
// Copy scanned blockchain // Copy scanned blockchain
@ -553,7 +553,7 @@ bool WalletImpl::createWatchOnly(const std::string &path, const std::string &pas
// Export/Import key images // Export/Import key images
// We already know the spent status from the outputs we exported, thus no need to check them again // We already know the spent status from the outputs we exported, thus no need to check them again
auto key_images = m_wallet->export_key_images(); auto key_images = m_wallet->export_key_images(true/*all*/);
uint64_t spent = 0; uint64_t spent = 0;
uint64_t unspent = 0; uint64_t unspent = 0;
view_wallet->import_key_images(key_images.second, key_images.first, spent, unspent, false); view_wallet->import_key_images(key_images.second, key_images.first, spent, unspent, false);

8
src/wallet/wallet2.cpp
View file

@ -13326,9 +13326,7 @@ size_t wallet2::import_outputs(const std::tuple<uint64_t, uint64_t, std::vector<
THROW_WALLET_EXCEPTION_IF(offset > m_transfers.size(), error::wallet_internal_error, THROW_WALLET_EXCEPTION_IF(offset > m_transfers.size(), error::wallet_internal_error,
"Imported outputs omit more outputs that we know of"); "Imported outputs omit more outputs that we know of");
THROW_WALLET_EXCEPTION_IF(offset >= num_outputs, error::wallet_internal_error, THROW_WALLET_EXCEPTION_IF(offset + output_array.size() > num_outputs, error::wallet_internal_error,
"Offset is larger than total outputs");
THROW_WALLET_EXCEPTION_IF(output_array.size() > num_outputs - offset, error::wallet_internal_error,
"Offset is larger than total outputs"); "Offset is larger than total outputs");
const size_t original_size = m_transfers.size(); const size_t original_size = m_transfers.size();
@ -13408,9 +13406,7 @@ size_t wallet2::import_outputs(const std::tuple<uint64_t, uint64_t, std::vector<
THROW_WALLET_EXCEPTION_IF(offset > m_transfers.size(), error::wallet_internal_error, THROW_WALLET_EXCEPTION_IF(offset > m_transfers.size(), error::wallet_internal_error,
"Imported outputs omit more outputs that we know of. Try using export_outputs all."); "Imported outputs omit more outputs that we know of. Try using export_outputs all.");
THROW_WALLET_EXCEPTION_IF(offset >= num_outputs, error::wallet_internal_error, THROW_WALLET_EXCEPTION_IF(offset + output_array.size() > num_outputs, error::wallet_internal_error,
"Offset is larger than total outputs");
THROW_WALLET_EXCEPTION_IF(output_array.size() > num_outputs - offset, error::wallet_internal_error,
"Offset is larger than total outputs"); "Offset is larger than total outputs");
const size_t original_size = m_transfers.size(); const size_t original_size = m_transfers.size();