Skip to content

bitcoind interface review. #810

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 8 commits into from
Jun 19, 2026
Merged

bitcoind interface review. #810

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
fbb0744
Use "bitcoind" for client-server protocol reference.
evoskuil Jun 19, 2026
51c0b59
Remove dead code.
evoskuil Jun 19, 2026
16d1666
Add missing includes, remove defaulted includes.
evoskuil Jun 19, 2026
ba9f9a9
Namespace consistency.
evoskuil Jun 19, 2026
6e6843b
Parameter/integrity validation, style, comments.
evoskuil Jun 19, 2026
3473897
Fox tx submission - validate and broadcast (no store).
evoskuil Jun 19, 2026
39ea38b
Electrum comment.
evoskuil Jun 19, 2026
3d96544
Adapt to upstream (node) change.
evoskuil Jun 19, 2026
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
3 changes: 0 additions & 3 deletions Makefile.am
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,6 @@ src_libbitcoin_server_la_SOURCES = \
src/parser.cpp \
src/server_node.cpp \
src/settings.cpp \
src/parsers/bitcoind_query.cpp \
src/parsers/bitcoind_target.cpp \
src/parsers/electrum_version.cpp \
src/parsers/native_query.cpp \
Expand Down Expand Up @@ -89,7 +88,6 @@ test_libbitcoin_server_test_SOURCES = \
test/test.hpp \
test/mocks/blocks.cpp \
test/mocks/blocks.hpp \
test/parsers/bitcoind_query.cpp \
test/parsers/bitcoind_target.cpp \
test/parsers/electrum_version.cpp \
test/parsers/native_query.cpp \
Expand Down Expand Up @@ -209,7 +207,6 @@ include_bitcoin_server_interfaces_HEADERS = \

include_bitcoin_server_parsersdir = ${includedir}/bitcoin/server/parsers
include_bitcoin_server_parsers_HEADERS = \
include/bitcoin/server/parsers/bitcoind_query.hpp \
include/bitcoin/server/parsers/bitcoind_target.hpp \
include/bitcoin/server/parsers/electrum_version.hpp \
include/bitcoin/server/parsers/native_query.hpp \
Expand Down
1 change: 0 additions & 1 deletion builds/msvc/vs2022/libbitcoin-server-test/libbitcoin-server-test.vcxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -122,7 +122,6 @@
<ClCompile Include="..\..\..\..\test\error.cpp" />
<ClCompile Include="..\..\..\..\test\main.cpp" />
<ClCompile Include="..\..\..\..\test\mocks\blocks.cpp" />
<ClCompile Include="..\..\..\..\test\parsers\bitcoind_query.cpp" />
<ClCompile Include="..\..\..\..\test\parsers\bitcoind_target.cpp" />
<ClCompile Include="..\..\..\..\test\parsers\electrum_version.cpp">
<ObjectFileName>$(IntDir)test_parsers_electrum_version.obj</ObjectFileName>
Expand Down
3 changes: 0 additions & 3 deletions builds/msvc/vs2022/libbitcoin-server-test/libbitcoin-server-test.vcxproj.filters
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,9 +42,6 @@
<ClCompile Include="..\..\..\..\test\mocks\blocks.cpp">
<Filter>src\mocks</Filter>
</ClCompile>
<ClCompile Include="..\..\..\..\test\parsers\bitcoind_query.cpp">
<Filter>src\parsers</Filter>
</ClCompile>
<ClCompile Include="..\..\..\..\test\parsers\bitcoind_target.cpp">
<Filter>src\parsers</Filter>
</ClCompile>
Expand Down
2 changes: 0 additions & 2 deletions builds/msvc/vs2022/libbitcoin-server/libbitcoin-server.vcxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -124,7 +124,6 @@
<ClCompile Include="..\..\..\..\src\configuration.cpp" />
<ClCompile Include="..\..\..\..\src\error.cpp" />
<ClCompile Include="..\..\..\..\src\parser.cpp" />
<ClCompile Include="..\..\..\..\src\parsers\bitcoind_query.cpp" />
<ClCompile Include="..\..\..\..\src\parsers\bitcoind_target.cpp" />
<ClCompile Include="..\..\..\..\src\parsers\electrum_version.cpp" />
<ClCompile Include="..\..\..\..\src\parsers\native_query.cpp" />
Expand Down Expand Up @@ -179,7 +178,6 @@
<ClInclude Include="..\..\..\..\include\bitcoin\server\interfaces\stratum_v2.hpp" />
<ClInclude Include="..\..\..\..\include\bitcoin\server\interfaces\types.hpp" />
<ClInclude Include="..\..\..\..\include\bitcoin\server\parser.hpp" />
<ClInclude Include="..\..\..\..\include\bitcoin\server\parsers\bitcoind_query.hpp" />
<ClInclude Include="..\..\..\..\include\bitcoin\server\parsers\bitcoind_target.hpp" />
<ClInclude Include="..\..\..\..\include\bitcoin\server\parsers\electrum_version.hpp" />
<ClInclude Include="..\..\..\..\include\bitcoin\server\parsers\native_query.hpp" />
Expand Down
6 changes: 0 additions & 6 deletions builds/msvc/vs2022/libbitcoin-server/libbitcoin-server.vcxproj.filters
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,9 +72,6 @@
<ClCompile Include="..\..\..\..\src\parser.cpp">
<Filter>src</Filter>
</ClCompile>
<ClCompile Include="..\..\..\..\src\parsers\bitcoind_query.cpp">
<Filter>src\parsers</Filter>
</ClCompile>
<ClCompile Include="..\..\..\..\src\parsers\bitcoind_target.cpp">
<Filter>src\parsers</Filter>
</ClCompile>
Expand Down Expand Up @@ -233,9 +230,6 @@
<ClInclude Include="..\..\..\..\include\bitcoin\server\parser.hpp">
<Filter>include\bitcoin\server</Filter>
</ClInclude>
<ClInclude Include="..\..\..\..\include\bitcoin\server\parsers\bitcoind_query.hpp">
<Filter>include\bitcoin\server\parsers</Filter>
</ClInclude>
<ClInclude Include="..\..\..\..\include\bitcoin\server\parsers\bitcoind_target.hpp">
<Filter>include\bitcoin\server\parsers</Filter>
</ClInclude>
Expand Down
1 change: 0 additions & 1 deletion builds/msvc/vs2026/libbitcoin-server-test/libbitcoin-server-test.vcxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -122,7 +122,6 @@
<ClCompile Include="..\..\..\..\test\error.cpp" />
<ClCompile Include="..\..\..\..\test\main.cpp" />
<ClCompile Include="..\..\..\..\test\mocks\blocks.cpp" />
<ClCompile Include="..\..\..\..\test\parsers\bitcoind_query.cpp" />
<ClCompile Include="..\..\..\..\test\parsers\bitcoind_target.cpp" />
<ClCompile Include="..\..\..\..\test\parsers\electrum_version.cpp">
<ObjectFileName>$(IntDir)test_parsers_electrum_version.obj</ObjectFileName>
Expand Down
3 changes: 0 additions & 3 deletions builds/msvc/vs2026/libbitcoin-server-test/libbitcoin-server-test.vcxproj.filters
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,9 +42,6 @@
<ClCompile Include="..\..\..\..\test\mocks\blocks.cpp">
<Filter>src\mocks</Filter>
</ClCompile>
<ClCompile Include="..\..\..\..\test\parsers\bitcoind_query.cpp">
<Filter>src\parsers</Filter>
</ClCompile>
<ClCompile Include="..\..\..\..\test\parsers\bitcoind_target.cpp">
<Filter>src\parsers</Filter>
</ClCompile>
Expand Down
2 changes: 0 additions & 2 deletions builds/msvc/vs2026/libbitcoin-server/libbitcoin-server.vcxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -124,7 +124,6 @@
<ClCompile Include="..\..\..\..\src\configuration.cpp" />
<ClCompile Include="..\..\..\..\src\error.cpp" />
<ClCompile Include="..\..\..\..\src\parser.cpp" />
<ClCompile Include="..\..\..\..\src\parsers\bitcoind_query.cpp" />
<ClCompile Include="..\..\..\..\src\parsers\bitcoind_target.cpp" />
<ClCompile Include="..\..\..\..\src\parsers\electrum_version.cpp" />
<ClCompile Include="..\..\..\..\src\parsers\native_query.cpp" />
Expand Down Expand Up @@ -179,7 +178,6 @@
<ClInclude Include="..\..\..\..\include\bitcoin\server\interfaces\stratum_v2.hpp" />
<ClInclude Include="..\..\..\..\include\bitcoin\server\interfaces\types.hpp" />
<ClInclude Include="..\..\..\..\include\bitcoin\server\parser.hpp" />
<ClInclude Include="..\..\..\..\include\bitcoin\server\parsers\bitcoind_query.hpp" />
<ClInclude Include="..\..\..\..\include\bitcoin\server\parsers\bitcoind_target.hpp" />
<ClInclude Include="..\..\..\..\include\bitcoin\server\parsers\electrum_version.hpp" />
<ClInclude Include="..\..\..\..\include\bitcoin\server\parsers\native_query.hpp" />
Expand Down
6 changes: 0 additions & 6 deletions builds/msvc/vs2026/libbitcoin-server/libbitcoin-server.vcxproj.filters
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,9 +72,6 @@
<ClCompile Include="..\..\..\..\src\parser.cpp">
<Filter>src</Filter>
</ClCompile>
<ClCompile Include="..\..\..\..\src\parsers\bitcoind_query.cpp">
<Filter>src\parsers</Filter>
</ClCompile>
<ClCompile Include="..\..\..\..\src\parsers\bitcoind_target.cpp">
<Filter>src\parsers</Filter>
</ClCompile>
Expand Down Expand Up @@ -233,9 +230,6 @@
<ClInclude Include="..\..\..\..\include\bitcoin\server\parser.hpp">
<Filter>include\bitcoin\server</Filter>
</ClInclude>
<ClInclude Include="..\..\..\..\include\bitcoin\server\parsers\bitcoind_query.hpp">
<Filter>include\bitcoin\server\parsers</Filter>
</ClInclude>
<ClInclude Include="..\..\..\..\include\bitcoin\server\parsers\bitcoind_target.hpp">
<Filter>include\bitcoin\server\parsers</Filter>
</ClInclude>
Expand Down
1 change: 0 additions & 1 deletion include/bitcoin/server.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,6 @@
#include <bitcoin/server/interfaces/stratum_v1.hpp>
#include <bitcoin/server/interfaces/stratum_v2.hpp>
#include <bitcoin/server/interfaces/types.hpp>
#include <bitcoin/server/parsers/bitcoind_query.hpp>
#include <bitcoin/server/parsers/bitcoind_target.hpp>
#include <bitcoin/server/parsers/electrum_version.hpp>
#include <bitcoin/server/parsers/native_query.hpp>
Expand Down
33 changes: 0 additions & 33 deletions include/bitcoin/server/parsers/bitcoind_query.hpp
View file
Open in desktop

This file was deleted.

1 change: 0 additions & 1 deletion include/bitcoin/server/parsers/parsers.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@
#ifndef LIBBITCOIN_SERVER_PARSERS_PARSERS_HPP
#define LIBBITCOIN_SERVER_PARSERS_PARSERS_HPP

#include <bitcoin/server/parsers/bitcoind_query.hpp>
#include <bitcoin/server/parsers/bitcoind_target.hpp>
#include <bitcoin/server/parsers/electrum_version.hpp>
#include <bitcoin/server/parsers/native_query.hpp>
Expand Down
6 changes: 5 additions & 1 deletion include/bitcoin/server/protocols/protocol_bitcoind_rpc.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,6 @@
#include <bitcoin/server/define.hpp>
#include <bitcoin/server/interfaces/interfaces.hpp>
#include <bitcoin/server/protocols/protocol_http.hpp>
#include <bitcoin/system/chain/json/json.hpp>

namespace libbitcoin {
namespace server {
Expand Down Expand Up @@ -148,6 +147,11 @@ class BCS_API protocol_bitcoind_rpc
const network::rpc::id_option& id,
const network::http::request_cptr& request) NOEXCEPT;

// Validate a transaction given next block context.
bool get_pool_context(system::chain::context& pool) const NOEXCEPT;
code validate_tx(const system::chain::transaction& tx) const NOEXCEPT;
code broadcast_tx(const system::chain::transaction::cptr& tx) NOEXCEPT;

// Obtain cached request and clear cache (requires strand).
network::http::request_cptr reset_rpc_request() NOEXCEPT;

Expand Down
42 changes: 0 additions & 42 deletions src/parsers/bitcoind_query.cpp
View file
Open in desktop

This file was deleted.

10 changes: 4 additions & 6 deletions src/parsers/bitcoind_target.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,6 @@

#include <charconv>
#include <iterator>
#include <ranges>
#include <optional>
#include <variant>
#include <bitcoin/server/define.hpp>

Expand All @@ -42,7 +40,7 @@ static hash_cptr to_hash(const std::string_view& token) NOEXCEPT
to_shared(std::move(out)) : hash_cptr{};
}

// Map a Bitcoin Core REST file extension to a media value.
// Map a bitcoind REST file extension to a media value.
static bool to_media(uint8_t& out, const std::string_view& extension) NOEXCEPT
{
if (extension == "bin")
Expand Down Expand Up @@ -87,7 +85,7 @@ static bool split_leaf(std::string& name, uint8_t& media,
return to_media(media, parts.back());
}

// Parse a Bitcoin Core REST path into a json-rpc request model.
// Parse a bitcoind REST path into a json-rpc request model.
// github.com/bitcoin/bitcoin/blob/master/doc/REST-interface.md
// Supports: block, block/notxdetails, blockhashbyheight, headers, blockpart,
// chaininfo (remaining endpoints return invalid_target until implemented).
Expand Down Expand Up @@ -116,7 +114,7 @@ code bitcoind_target(request_t& out, const std::string_view& path) NOEXCEPT

size_t segment{};

// Accept an optional "rest" prefix (Core mounts endpoints under /rest/).
// Accept an optional "rest" prefix (bitcoind mounts endpoints under /rest/).
if (segments[segment] == "rest")
++segment;

Expand Down Expand Up @@ -239,7 +237,7 @@ code bitcoind_target(request_t& out, const std::string_view& path) NOEXCEPT
"block_filter_headers";
params["media"] = media;
params["hash"] = hash;
params["type"] = uint8_t{ 0 };
params["type"] = 0_u8;
return error::success;
}

Expand Down
Loading
Loading