Skip to content

Fix unstranded handling in address completion, simplify. #920

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
evoskuil merged 2 commits into from
Dec 11, 2025
Merged

Fix unstranded handling in address completion, simplify. #920

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b1f5c5c
Require explicit format for explore requests.
evoskuil Dec 11, 2025
62eca6b
Fix unstranded handling in address completion, simplify.
evoskuil Dec 11, 2025
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
14 changes: 5 additions & 9 deletions include/bitcoin/node/protocols/protocol_explore.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -148,21 +148,17 @@ class BCN_API protocol_explore
const system::hash_cptr& hash, bool turbo) NOEXCEPT;

private:
using balance_handler = std::function<void(code, uint8_t, uint64_t)>;
using address_handler = std::function<void(code, uint8_t,
database::outpoints&&)>;

void do_get_address(uint8_t media, bool turbo,
const system::hash_cptr& hash, const address_handler& handler) NOEXCEPT;
const system::hash_cptr& hash) NOEXCEPT;
void do_get_address_confirmed(uint8_t media, bool turbo,
const system::hash_cptr& hash, const address_handler& handler) NOEXCEPT;
void do_get_address_unconfirmed(uint8_t media, bool turbo,
const system::hash_cptr& hash, const address_handler& handler) NOEXCEPT;
const system::hash_cptr& hash) NOEXCEPT;
////void do_get_address_unconfirmed(uint8_t media, bool turbo,
//// const system::hash_cptr& hash) NOEXCEPT;
void complete_get_address(const code& ec, uint8_t media,
const database::outpoints& set) NOEXCEPT;

void do_get_address_balance(uint8_t media, bool turbo,
const system::hash_cptr& hash, const balance_handler& handler) NOEXCEPT;
const system::hash_cptr& hash) NOEXCEPT;
void complete_get_address_balance(const code& ec, uint8_t media,
const uint64_t balance) NOEXCEPT;

Expand Down
20 changes: 11 additions & 9 deletions src/parse/query.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,15 +87,17 @@ bool parse_query(rpc::request_t& out, const request& request) NOEXCEPT
return true;
}

////if (contains(accepts, json) || format == "json")
////{
//// params["media"] = to_value(json);
//// return true;
////}

// Default to json.
params["media"] = to_value(json);
return true;
////// Default format to json.
////params["media"] = to_value(json);
////return true;

if (contains(accepts, json) || format == "json")
{
params["media"] = to_value(json);
return true;
}

return false;
}

BC_POP_WARNING()
Expand Down
66 changes: 22 additions & 44 deletions src/protocols/protocol_explore.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -943,24 +943,20 @@ bool protocol_explore::handle_get_address(const code& ec, interface::address,
return true;
}

address_handler complete = BIND(complete_get_address, _1, _2, _3);
PARALLEL(do_get_address, media, turbo, hash, std::move(complete));
PARALLEL(do_get_address, media, turbo, hash);
return true;
}

// private
void protocol_explore::do_get_address(uint8_t media, bool turbo,
const hash_cptr& hash, const address_handler& handler) NOEXCEPT
const hash_cptr& hash) NOEXCEPT
{
outpoints set{};
if (const auto ec = archive().get_address_outputs(stopping_, set,
*hash, turbo))
{
handler(ec, {}, {});
return;
}
BC_ASSERT(!stranded());

handler(network::error::success, media, std::move(set));
outpoints set{};
const auto& query = archive();
const auto ec = query.get_address_outputs(stopping_, set, *hash, turbo);
POST(complete_get_address, ec, media, std::move(set));
}

// This is shared by the three get_address... methods.
Expand Down Expand Up @@ -1017,24 +1013,20 @@ bool protocol_explore::handle_get_address_confirmed(const code& ec,
return true;
}

address_handler complete = BIND(complete_get_address, _1, _2, _3);
PARALLEL(do_get_address_confirmed, media, turbo, hash, std::move(complete));
PARALLEL(do_get_address_confirmed, media, turbo, hash);
return true;
}

// private
void protocol_explore::do_get_address_confirmed(uint8_t media, bool turbo,
const hash_cptr& hash, const address_handler& handler) NOEXCEPT
const hash_cptr& hash) NOEXCEPT
{
outpoints set{};
if (const auto ec = archive().get_confirmed_unspent_outputs(stopping_,
set, *hash, turbo))
{
handler(ec, {}, {});
return;
}
BC_ASSERT(!stranded());

handler(network::error::success, media, std::move(set));
outpoints set{};
const auto& query = archive();
auto ec = query.get_confirmed_unspent_outputs(stopping_, set, *hash, turbo);
POST(complete_get_address, ec, media, std::move(set));
}

// handle_get_address_unconfirmed
Expand All @@ -1050,16 +1042,6 @@ bool protocol_explore::handle_get_address_unconfirmed(const code& ec,
// TODO: there are currently no unconfirmed txs.
send_not_implemented();
return true;

////address_handler complete = BIND(complete_get_address, _1, _2, _3);
////PARALLEL(do_get_address_unconfirmed, media, turbo, hash, std::move(complete));
////return true;
}

void protocol_explore::do_get_address_unconfirmed(uint8_t media, bool,
const system::hash_cptr&, const address_handler& handler) NOEXCEPT
{
handler(network::error::success, media, {});
}

// handle_get_address_balance
Expand All @@ -1079,31 +1061,27 @@ bool protocol_explore::handle_get_address_balance(const code& ec,
return true;
}

balance_handler complete = BIND(complete_get_address_balance, _1, _2, _3);
PARALLEL(do_get_address_balance, media, turbo, hash, std::move(complete));
PARALLEL(do_get_address_balance, media, turbo, hash);
return true;
}

void protocol_explore::do_get_address_balance(uint8_t media, bool turbo,
const system::hash_cptr& hash, const balance_handler& handler) NOEXCEPT
const system::hash_cptr& hash) NOEXCEPT
{
uint64_t balance{};
if (const auto ec = archive().get_confirmed_balance(stopping_, balance,
*hash, turbo))
{
handler(ec, {}, {});
return;
}
BC_ASSERT(!stranded());

handler(network::error::success, media, balance);
uint64_t balance{};
const auto& query = archive();
auto ec = query.get_confirmed_balance(stopping_, balance, *hash, turbo);
POST(complete_get_address_balance, ec, media, balance);
}

void protocol_explore::complete_get_address_balance(const code& ec,
uint8_t media, uint64_t balance) NOEXCEPT
{
BC_ASSERT(stranded());

// This suppresses the error response resulting from cancelation.
// Suppresses cancelation error response.
if (stopped())
return;

Expand Down
Loading