Skip to content

Decode witness transactions if sent from >= v3.4 server. #199

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
Dec 30, 2017
Merged

Decode witness transactions if sent from >= v3.4 server. #199

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
9 changes: 6 additions & 3 deletions src/proxy.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,18 +45,20 @@ proxy::proxy(stream& out, unknown_handler on_unknown_command,
// Fetchers.
//-----------------------------------------------------------------------------

// This will fail if a witness tx is sent to a < v3.4 (pre-witness) server.
void proxy::transaction_pool_broadcast(error_handler on_error,
result_handler on_reply, const chain::transaction& tx)
{
send_request("transaction_pool.broadcast", tx.to_data(), on_error,
send_request("transaction_pool.broadcast", tx.to_data(true, true), on_error,
std::bind(decode_empty,
_1, on_reply));
}

// This will fail if a witness tx is sent to a < v3.4 (pre-witness) server.
void proxy::transaction_pool_validate2(error_handler on_error,
result_handler on_reply, const chain::transaction& tx)
{
send_request("transaction_pool.validate2", tx.to_data(), on_error,
send_request("transaction_pool.validate2", tx.to_data(true, true), on_error,
std::bind(decode_empty,
_1, on_reply));
}
Expand Down Expand Up @@ -287,10 +289,11 @@ bool proxy::decode_empty(reader& payload, result_handler& handler)
return true;
}

// Compatibility: This will accept witness transactions (from >= 3.4 server).
bool proxy::decode_transaction(reader& payload, transaction_handler& handler)
{
transaction tx;
if (!tx.from_data(payload) || !payload.is_exhausted())
if (!tx.from_data(payload, true, true) || !payload.is_exhausted())
return false;

handler(tx);
Expand Down