Skip to content

Correct payment_record change induced break. #207

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Mar 7, 2018
Merged

Correct payment_record change induced break. #207

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions src/proxy.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -164,7 +164,7 @@ void proxy::blockchain_fetch_stealth2(error_handler on_error,
{
const auto bits = prefix.size();

if (bits < stealth_address::min_filter_bits ||
if (bits < stealth_address::min_filter_bits ||
bits > stealth_address::max_filter_bits)
{
on_error(error::bad_stream);
Expand Down Expand Up @@ -380,10 +380,10 @@ history::list proxy::expand(payment_record::list& records)
{
if (record.is_output())
{
const auto temporary_checksum = record.point().checksum();
const auto temporary_checksum = record.data();
result.push_back(history
{
std::move(record.point()),
output_point{ record.hash(), record.index() },
record.height(),
record.data(),
input_point{ null_hash, point::null_index },
Expand Down Expand Up @@ -419,14 +419,14 @@ history::list proxy::expand(payment_record::list& records)
if (history.spend.is_null())
{
// Move the spend to the row of its correlated output.
history.spend = std::move(record.point());
history.spend = input_point{ record.hash(), record.index() };
history.spend_height = record.height();
found = true;
break;
}
}

// This will only happen if the history height cutoff comes between an
// This will only happen if the history height cutoff comes between an
// output and its spend. In this case we return just the spend.
// This is not strictly sufficient because of checksum hash collisions,
// So this miscorrelation must be discarded as a fault signal.
Expand All @@ -437,7 +437,7 @@ history::list proxy::expand(payment_record::list& records)
output_point{ null_hash, point::null_index },
max_size_t,
max_uint64,
std::move(record.point()),
input_point{ record.hash(), record.index() },
{ record.height() }
});
}
Expand Down