mirror of
https://github.com/monero-project/monero.git
synced 2024-12-25 22:49:24 -05:00
wallet2: validate fetched block height and parent hash
This commit is contained in:
parent
c634c261c2
commit
a026d5ac44
@ -2891,6 +2891,10 @@ void wallet2::process_new_blockchain_entry(const cryptonote::block& b, const cry
|
||||
"block transactions=" + std::to_string(bche.txs.size()) +
|
||||
" not match with daemon response size=" + std::to_string(parsed_block.o_indices.indices.size()));
|
||||
|
||||
THROW_WALLET_EXCEPTION_IF(height != m_blockchain.size(), error::wallet_internal_error,
|
||||
"New blockchain entry mismatch: block height " + std::to_string(height) +
|
||||
" is not the expected next height " + std::to_string(m_blockchain.size()));
|
||||
|
||||
//handle transactions from new block
|
||||
|
||||
//optimization: seeking only for blocks that are not older then the wallet creation time plus 1 day. 1 day is for possible user incorrect time setup
|
||||
@ -3124,8 +3128,22 @@ void wallet2::process_parsed_blocks(const uint64_t start_height, const std::vect
|
||||
num_txes += 1 + parsed_blocks[i].txes.size();
|
||||
tx_cache_data.resize(num_txes);
|
||||
size_t txidx = 0;
|
||||
crypto::hash prev_block_id;
|
||||
bool has_prev_block = m_blockchain.is_in_bounds(start_height - 1);
|
||||
if (has_prev_block) {
|
||||
prev_block_id = m_blockchain[start_height - 1];
|
||||
}
|
||||
for (size_t i = 0; i < blocks.size(); ++i)
|
||||
{
|
||||
if (has_prev_block) {
|
||||
THROW_WALLET_EXCEPTION_IF(prev_block_id != parsed_blocks[i].block.prev_id, error::wallet_internal_error,
|
||||
"Parent block hash mismatch at height " + std::to_string(start_height + i) +
|
||||
": expected " + string_tools::pod_to_hex(prev_block_id) +
|
||||
", but received a new block with prev_id " + string_tools::pod_to_hex(parsed_blocks[i].block.prev_id));
|
||||
}
|
||||
prev_block_id = parsed_blocks[i].hash;
|
||||
has_prev_block = true;
|
||||
|
||||
THROW_WALLET_EXCEPTION_IF(parsed_blocks[i].txes.size() != parsed_blocks[i].block.tx_hashes.size(),
|
||||
error::wallet_internal_error, "Mismatched parsed_blocks[i].txes.size() and parsed_blocks[i].block.tx_hashes.size()");
|
||||
if (should_skip_block(parsed_blocks[i].block, start_height + i))
|
||||
|
Loading…
Reference in New Issue
Block a user