What changed, and why it matters
This change fixes a bug in how Monero wallets import 'outputs' (records of received funds). Previously, if an import failed part-way through—because the wallet lacked a needed subaddress—the code could leave behind partially-created records. These incomplete records could later be mistaken for valid, spendable money, potentially causing the wallet to build transactions that fail or behave incorrectly. The patch now only adds fully validated records and cleans up properly if the total number shrinks. A new test confirms that a failed import does not leave incomplete transfers behind.
Apply the patch and run the new cold_signing functional test. Wallet users who have imported outputs on cold wallets should rescan/refresh after upgrading to ensure no stale incomplete transfer records remain.
Security signals we found
Partial/incomplete state left in wallet database after an exception
Key image generation failure could create transfer records missing critical fields
Mismatch between m_transfers size and actual successfully imported outputs
Functional test added to verify no incomplete transfers survive a failed import
Evidence from the diff
wallet2::import_outputs previously resized m_transfers up-front, then wrote entries during processing. If processing later threw (e.g., ‘Failed to generate key image’ when a subaddress was missing), already-written slots contained partially-populated transfer_details. The patch defers m_transfers mutation: it validates each output, then either replaces an existing entry or appends a fully-constructed transfer_details. Trimming to num_outputs is moved to after the loop. A functional test (cold_signing.py) reproduces the scenario: hot wallet exports outputs including a high-index subaddress, cold wallet import fails, and the test asserts no incomplete key_image-less transfers remain; after creating the missing subaddresses, import succeeds and the output is correct.
Changed components
src/wallet/wallet2.cpptests/functional_tests/cold_signing.pyInspect captured patch +85 / −45
### src/wallet/wallet2.cpp
@@ -14684,13 +14684,6 @@ size_t wallet2::import_outputs(const std::tuple<uint64_t, uint64_t, std::vector<
"Offset is larger than total outputs");
const size_t original_size = m_transfers.size();
- if (offset + output_array.size() > m_transfers.size())
- m_transfers.resize(offset + output_array.size());
- else if (num_outputs < m_transfers.size())
- {
- trim_transfer_maps(num_outputs);
- m_transfers.resize(num_outputs);
- }
for (size_t i = 0; i < output_array.size(); ++i)
{
@@ -14740,11 +14733,21 @@ size_t wallet2::import_outputs(const std::tuple<uint64_t, uint64_t, std::vector<
THROW_WALLET_EXCEPTION_IF(in_ephemeral.pub != out_key,
error::wallet_internal_error, "key_image generated ephemeral public key not matched with output_key at index " + boost::lexical_cast<std::string>(i + offset));
- m_key_images[td.m_key_image] = i + offset;
- m_pub_keys[td.get_public_key()] = i + offset;
- m_transfers[i + offset] = std::move(td);
+ const crypto::key_image key_image = td.m_key_image;
+ const crypto::public_key pub_key = td.get_public_key();
+ if (i + offset < m_transfers.size())
+ m_transfers[i + offset] = std::move(td);
+ else
+ m_transfers.push_back(std::move(td));
+ m_key_images[key_image] = i + offset;
+ m_pub_keys[pub_key] = i + offset;
}
+ if (num_outputs < m_transfers.size())
+ {
+ trim_transfer_maps(num_outputs);
+ m_transfers.resize(num_outputs);
+ }
return m_transfers.size();
}
//----------------------------------------------------------------------------------------------------
@@ -14767,50 +14770,43 @@ size_t wallet2::import_outputs(const std::tuple<uint64_t, uint64_t, std::vector<
"Offset is larger than total outputs");
const size_t original_size = m_transfers.size();
- if (offset + output_array.size() > m_transfers.size())
- m_transfers.resize(offset + output_array.size());
- else if (num_outputs < m_transfers.size())
- {
- trim_transfer_maps(num_outputs);
- m_transfers.resize(num_outputs);
- }
for (size_t i = 0; i < output_array.size(); ++i)
{
exported_transfer_details etd = output_array[i];
- transfer_details &td = m_transfers[i + offset];
-
- // setup td with "cheap" loaded data
- td.m_block_height = 0;
- td.m_txid = crypto::null_hash;
- td.m_global_output_index = etd.m_global_output_index;
- td.m_spent = etd.m_flags.m_spent;
- td.m_frozen = etd.m_flags.m_frozen;
- td.m_spent_height = 0;
- td.m_mask = rct::identity();
- td.m_amount = etd.m_amount;
- td.m_rct = etd.m_flags.m_rct;
- td.m_key_image_known = etd.m_flags.m_key_image_known;
- td.m_key_image_request = etd.m_flags.m_key_image_request;
- td.m_key_image_partial = false;
- td.m_subaddr_index.major = etd.m_subaddr_index_major;
- td.m_subaddr_index.minor = etd.m_subaddr_index_minor;
+ const auto set_cheap_data = [&etd](transfer_details &td) {
+ td.m_block_height = 0;
+ td.m_txid = crypto::null_hash;
+ td.m_global_output_index = etd.m_global_output_index;
+ td.m_spent = etd.m_flags.m_spent;
+ td.m_frozen = etd.m_flags.m_frozen;
+ td.m_spent_height = 0;
+ td.m_mask = rct::identity();
+ td.m_amount = etd.m_amount;
+ td.m_rct = etd.m_flags.m_rct;
+ td.m_key_image_known = etd.m_flags.m_key_image_known;
+ td.m_key_image_request = etd.m_flags.m_key_image_request;
+ td.m_key_image_partial = false;
+ td.m_subaddr_index.major = etd.m_subaddr_index_major;
+ td.m_subaddr_index.minor = etd.m_subaddr_index_minor;
+ };
// skip those we've already imported, or which have different data
if (i + offset < original_size)
{
- bool needs_processing = false;
- if (!td.m_key_image_known)
- needs_processing = true;
- else if (!(etd.m_internal_output_index == td.m_internal_output_index))
- needs_processing = true;
- else if (!(etd.m_pubkey == td.get_public_key()))
- needs_processing = true;
-
- if (!needs_processing)
+ const transfer_details &org_td = m_transfers[i + offset];
+ if (etd.m_flags.m_key_image_known && org_td.m_key_image_known &&
+ etd.m_internal_output_index == org_td.m_internal_output_index &&
+ etd.m_pubkey == org_td.get_public_key())
+ {
+ set_cheap_data(m_transfers[i + offset]);
continue;
+ }
}
+ transfer_details td = i + offset < original_size ? m_transfers[i + offset] : transfer_details{};
+ set_cheap_data(td);
+
// construct a synthetic tx prefix that has the info we'll need: the output with its pubkey, the tx pubkey in extra
td.m_tx = {};
@@ -14847,10 +14843,21 @@ size_t wallet2::import_outputs(const std::tuple<uint64_t, uint64_t, std::vector<
THROW_WALLET_EXCEPTION_IF(in_ephemeral.pub != out_key,
error::wallet_internal_error, "key_image generated ephemeral public key not matched with output_key at index " + boost::lexical_cast<std::string>(i + offset));
- m_key_images[td.m_key_image] = i + offset;
- m_pub_keys[td.get_public_key()] = i + offset;
+ const crypto::key_image key_image = td.m_key_image;
+ const crypto::public_key pub_key = td.get_public_key();
+ if (i + offset < m_transfers.size())
+ m_transfers[i + offset] = std::move(td);
+ else
+ m_transfers.push_back(std::move(td));
+ m_key_images[key_image] = i + offset;
+ m_pub_keys[pub_key] = i + offset;
}
+ if (num_outputs < m_transfers.size())
+ {
+ trim_transfer_maps(num_outputs);
+ m_transfers.resize(num_outputs);
+ }
return m_transfers.size();
}
//----------------------------------------------------------------------------------------------------
### tests/functional_tests/cold_signing.py
@@ -56,6 +56,7 @@ def run_test(self):
self.transfer_to_multi_subaddresses()
self.self_transfer_to_other_account()
self.sweep()
+ self.failed_output_import_keeps_complete_transfers()
def reset(self):
print('Resetting blockchain')
@@ -438,6 +439,38 @@ def sweep(self):
self.sign_and_submit(res.unsigned_txset)
+ def failed_output_import_keeps_complete_transfers(self):
+ print("Checking failed output import leaves no incomplete transfer")
+ self.mine(10)
+ self.export_import(False)
+ for _ in range(4):
+ self.hot_wallet.create_address(count = 64)
+ address = self.hot_wallet.get_address(subaddresses = [220]).addresses[0].address
+ tx = self.hot_wallet.sweep_all(address)
+ self.sign_and_submit(tx.unsigned_txset)
+
+ outputs = self.hot_wallet.export_outputs(all = True)
+ hot_transfers = self.hot_wallet.incoming_transfers().transfers
+ high_subaddress_output = next(t for t in hot_transfers if t.subaddr_index.minor == 220)
+ before_count = len(self.cold_wallet.incoming_transfers().get('transfers', []))
+ try:
+ self.cold_wallet.import_outputs(outputs.outputs_data_hex)
+ assert False, "import unexpectedly succeeded without the subaddress"
+ except Exception as e:
+ assert 'Failed to generate key image' in str(e), str(e)
+ after_failure = self.cold_wallet.incoming_transfers().get('transfers', [])
+ assert all(t.key_image for t in after_failure[before_count:])
+ assert len(after_failure) < len(hot_transfers)
+
+ for _ in range(4):
+ self.cold_wallet.create_address(count = 64)
+ self.cold_wallet.import_outputs(outputs.outputs_data_hex)
+ cold_transfers = self.cold_wallet.incoming_transfers().transfers
+ assert len(cold_transfers) == len(hot_transfers)
+ imported_output = next(t for t in cold_transfers if t.pubkey == high_subaddress_output.pubkey)
+ assert imported_output.subaddr_index.minor == 220
+ assert imported_output.key_image
+
class Guard:
def __enter__(self):
for i in range(2):Why this scored 59/100
Community notes
Notes can correct, qualify, or add evidence to the AI analysis. Every note shown here has been validated by a human moderator.
The AI analysis stands alone for now. Submit a note if you can add evidence or important context.