Skip to content

Refactor interface sources. #880

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 7 commits into from
Aug 27, 2026
Merged

Refactor interface sources. #880

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
2ce37bf
Refactor interface sources.
evoskuil Aug 26, 2026
b726ea9
Move serializers and utils out of interface impls.
evoskuil Aug 26, 2026
8d3b59a
Add the rest deploymentinfo endpoint.
evoskuil Aug 27, 2026
4f46688
Support both blockfilterheaders count forms.
evoskuil Aug 27, 2026
e1b7609
Reshape blockpart to the bitcoind query form.
evoskuil Aug 27, 2026
b42dd72
Serve spent tx outputs at the bitcoind path and framing.
evoskuil Aug 27, 2026
ed74a28
Add the bip64 getutxos endpoint.
evoskuil Aug 27, 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
53 changes: 38 additions & 15 deletions builds/gnu/Makefile.am
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,14 +57,11 @@ src_libbitcoin_server_la_SOURCES = \
${srcdir}/../../src/error/error_t.cpp \
${srcdir}/../../src/parsers/admin_query.cpp \
${srcdir}/../../src/parsers/admin_target.cpp \
${srcdir}/../../src/parsers/bitcoind_block_stats.cpp \
${srcdir}/../../src/parsers/bitcoind_descriptor.cpp \
${srcdir}/../../src/parsers/bitcoind_merkle.cpp \
${srcdir}/../../src/parsers/bitcoind_query.cpp \
${srcdir}/../../src/parsers/bitcoind_scan.cpp \
${srcdir}/../../src/parsers/bitcoind_script.cpp \
${srcdir}/../../src/parsers/bitcoind_target.cpp \
${srcdir}/../../src/parsers/btcd_filter.cpp \
${srcdir}/../../src/parsers/electrum_version.cpp \
${srcdir}/../../src/parsers/native_query.cpp \
${srcdir}/../../src/parsers/native_target.cpp \
${srcdir}/../../src/protocols/protocol_html.cpp \
Expand Down Expand Up @@ -105,7 +102,15 @@ src_libbitcoin_server_la_SOURCES = \
${srcdir}/../../src/protocols/native/protocol_native_input.cpp \
${srcdir}/../../src/protocols/native/protocol_native_output.cpp \
${srcdir}/../../src/protocols/native/protocol_native_tx.cpp \
${srcdir}/../../src/protocols/stratum_v1/protocol_stratum_v1.cpp
${srcdir}/../../src/protocols/stratum_v1/protocol_stratum_v1.cpp \
${srcdir}/../../src/serializers/bitcoind_block_stats.cpp \
${srcdir}/../../src/serializers/bitcoind_coin.cpp \
${srcdir}/../../src/serializers/bitcoind_deployments.cpp \
${srcdir}/../../src/serializers/bitcoind_json.cpp \
${srcdir}/../../src/serializers/bitcoind_psbt.cpp \
${srcdir}/../../src/utilities/bitcoind_descriptor.cpp \
${srcdir}/../../src/utilities/bitcoind_merkle.cpp \
${srcdir}/../../src/utilities/electrum_version.cpp

include_bitcoindir = \
${includedir}/bitcoin
Expand Down Expand Up @@ -180,14 +185,11 @@ include_bitcoin_server_parsersdir = \
include_bitcoin_server_parsers_HEADERS = \
${srcdir}/../../include/bitcoin/server/parsers/admin_query.hpp \
${srcdir}/../../include/bitcoin/server/parsers/admin_target.hpp \
${srcdir}/../../include/bitcoin/server/parsers/bitcoind_block_stats.hpp \
${srcdir}/../../include/bitcoin/server/parsers/bitcoind_descriptor.hpp \
${srcdir}/../../include/bitcoin/server/parsers/bitcoind_merkle.hpp \
${srcdir}/../../include/bitcoin/server/parsers/bitcoind_query.hpp \
${srcdir}/../../include/bitcoin/server/parsers/bitcoind_scan.hpp \
${srcdir}/../../include/bitcoin/server/parsers/bitcoind_script.hpp \
${srcdir}/../../include/bitcoin/server/parsers/bitcoind_target.hpp \
${srcdir}/../../include/bitcoin/server/parsers/btcd_filter.hpp \
${srcdir}/../../include/bitcoin/server/parsers/electrum_version.hpp \
${srcdir}/../../include/bitcoin/server/parsers/native_query.hpp \
${srcdir}/../../include/bitcoin/server/parsers/native_target.hpp \
${srcdir}/../../include/bitcoin/server/parsers/parsers.hpp
Expand Down Expand Up @@ -221,6 +223,18 @@ include_bitcoin_server_protocols_HEADERS = \
${srcdir}/../../include/bitcoin/server/protocols/protocol_stratum_v2.hpp \
${srcdir}/../../include/bitcoin/server/protocols/protocols.hpp

include_bitcoin_server_serializersdir = \
${includedir}/bitcoin/server/serializers

include_bitcoin_server_serializers_HEADERS = \
${srcdir}/../../include/bitcoin/server/serializers/bitcoind_block_stats.hpp \
${srcdir}/../../include/bitcoin/server/serializers/bitcoind_coin.hpp \
${srcdir}/../../include/bitcoin/server/serializers/bitcoind_data.hpp \
${srcdir}/../../include/bitcoin/server/serializers/bitcoind_deployments.hpp \
${srcdir}/../../include/bitcoin/server/serializers/bitcoind_json.hpp \
${srcdir}/../../include/bitcoin/server/serializers/bitcoind_psbt.hpp \
${srcdir}/../../include/bitcoin/server/serializers/serializers.hpp

include_bitcoin_server_sessionsdir = \
${includedir}/bitcoin/server/sessions

Expand All @@ -230,6 +244,15 @@ include_bitcoin_server_sessions_HEADERS = \
${srcdir}/../../include/bitcoin/server/sessions/session_server.hpp \
${srcdir}/../../include/bitcoin/server/sessions/sessions.hpp

include_bitcoin_server_utilitiesdir = \
${includedir}/bitcoin/server/utilities

include_bitcoin_server_utilities_HEADERS = \
${srcdir}/../../include/bitcoin/server/utilities/bitcoind_descriptor.hpp \
${srcdir}/../../include/bitcoin/server/utilities/bitcoind_merkle.hpp \
${srcdir}/../../include/bitcoin/server/utilities/electrum_version.hpp \
${srcdir}/../../include/bitcoin/server/utilities/utilities.hpp

# Tests.
#==============================================================================
# Target test 'test/libbitcoin-server-test'
Expand Down Expand Up @@ -265,17 +288,12 @@ test_libbitcoin_server_test_SOURCES = \
${srcdir}/../../test/mocks/blocks.cpp \
${srcdir}/../../test/parsers/admin_query.cpp \
${srcdir}/../../test/parsers/admin_target.cpp \
${srcdir}/../../test/parsers/bitcoind_block_stats.cpp \
${srcdir}/../../test/parsers/bitcoind_descriptor.cpp \
${srcdir}/../../test/parsers/bitcoind_merkle.cpp \
${srcdir}/../../test/parsers/bitcoind_query.cpp \
${srcdir}/../../test/parsers/bitcoind_target.cpp \
${srcdir}/../../test/parsers/electrum_version.cpp \
${srcdir}/../../test/parsers/native_query.cpp \
${srcdir}/../../test/parsers/native_target.cpp \
${srcdir}/../../test/protocols/admin/admin_diagnostics.cpp \
${srcdir}/../../test/protocols/admin/admin_setup_fixture.cpp \
${srcdir}/../../test/protocols/bitcoind/bitcoind_json.cpp \
${srcdir}/../../test/protocols/bitcoind/bitcoind_rest.cpp \
${srcdir}/../../test/protocols/bitcoind/bitcoind_rpc.cpp \
${srcdir}/../../test/protocols/bitcoind/bitcoind_setup_fixture.cpp \
Expand All @@ -300,7 +318,12 @@ test_libbitcoin_server_test_SOURCES = \
${srcdir}/../../test/protocols/native/native_input.cpp \
${srcdir}/../../test/protocols/native/native_output.cpp \
${srcdir}/../../test/protocols/native/native_setup_fixture.cpp \
${srcdir}/../../test/protocols/native/native_tx.cpp
${srcdir}/../../test/protocols/native/native_tx.cpp \
${srcdir}/../../test/serializers/bitcoind_block_stats.cpp \
${srcdir}/../../test/serializers/bitcoind_json.cpp \
${srcdir}/../../test/utilities/bitcoind_descriptor.cpp \
${srcdir}/../../test/utilities/bitcoind_merkle.cpp \
${srcdir}/../../test/utilities/electrum_version.cpp

TESTS = test_runner.sh

Expand Down
14 changes: 7 additions & 7 deletions 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 @@ -126,19 +126,12 @@
<ClCompile Include="..\..\..\..\test\mocks\blocks.cpp" />
<ClCompile Include="..\..\..\..\test\parsers\admin_query.cpp" />
<ClCompile Include="..\..\..\..\test\parsers\admin_target.cpp" />
<ClCompile Include="..\..\..\..\test\parsers\bitcoind_block_stats.cpp" />
<ClCompile Include="..\..\..\..\test\parsers\bitcoind_descriptor.cpp" />
<ClCompile Include="..\..\..\..\test\parsers\bitcoind_merkle.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>
</ClCompile>
<ClCompile Include="..\..\..\..\test\parsers\native_query.cpp" />
<ClCompile Include="..\..\..\..\test\parsers\native_target.cpp" />
<ClCompile Include="..\..\..\..\test\protocols\admin\admin_diagnostics.cpp" />
<ClCompile Include="..\..\..\..\test\protocols\admin\admin_setup_fixture.cpp" />
<ClCompile Include="..\..\..\..\test\protocols\bitcoind\bitcoind_json.cpp" />
<ClCompile Include="..\..\..\..\test\protocols\bitcoind\bitcoind_rest.cpp" />
<ClCompile Include="..\..\..\..\test\protocols\bitcoind\bitcoind_rpc.cpp" />
<ClCompile Include="..\..\..\..\test\protocols\bitcoind\bitcoind_setup_fixture.cpp" />
Expand Down Expand Up @@ -166,8 +159,15 @@
<ClCompile Include="..\..\..\..\test\protocols\native\native_output.cpp" />
<ClCompile Include="..\..\..\..\test\protocols\native\native_setup_fixture.cpp" />
<ClCompile Include="..\..\..\..\test\protocols\native\native_tx.cpp" />
<ClCompile Include="..\..\..\..\test\serializers\bitcoind_block_stats.cpp" />
<ClCompile Include="..\..\..\..\test\serializers\bitcoind_json.cpp" />
<ClCompile Include="..\..\..\..\test\settings.cpp" />
<ClCompile Include="..\..\..\..\test\test.cpp" />
<ClCompile Include="..\..\..\..\test\utilities\bitcoind_descriptor.cpp" />
<ClCompile Include="..\..\..\..\test\utilities\bitcoind_merkle.cpp" />
<ClCompile Include="..\..\..\..\test\utilities\electrum_version.cpp">
<ObjectFileName>$(IntDir)test_utilities_electrum_version.obj</ObjectFileName>
</ClCompile>
</ItemGroup>
<ItemGroup>
<ClInclude Include="..\..\..\..\test\mocks\blocks.hpp" />
Expand Down
36 changes: 21 additions & 15 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 @@ -37,6 +37,12 @@
<Filter Include="src\protocols\native">
<UniqueIdentifier>{66A0E586-2E3A-448F-0000-000000000009}</UniqueIdentifier>
</Filter>
<Filter Include="src\serializers">
<UniqueIdentifier>{66A0E586-2E3A-448F-0000-00000000000A}</UniqueIdentifier>
</Filter>
<Filter Include="src\utilities">
<UniqueIdentifier>{66A0E586-2E3A-448F-0000-00000000000B}</UniqueIdentifier>
</Filter>
</ItemGroup>
<ItemGroup>
<ClCompile Include="..\..\..\..\test\configuration.cpp">
Expand All @@ -63,24 +69,12 @@
<ClCompile Include="..\..\..\..\test\parsers\admin_target.cpp">
<Filter>src\parsers</Filter>
</ClCompile>
<ClCompile Include="..\..\..\..\test\parsers\bitcoind_block_stats.cpp">
<Filter>src\parsers</Filter>
</ClCompile>
<ClCompile Include="..\..\..\..\test\parsers\bitcoind_descriptor.cpp">
<Filter>src\parsers</Filter>
</ClCompile>
<ClCompile Include="..\..\..\..\test\parsers\bitcoind_merkle.cpp">
<Filter>src\parsers</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>
<ClCompile Include="..\..\..\..\test\parsers\electrum_version.cpp">
<Filter>src\parsers</Filter>
</ClCompile>
<ClCompile Include="..\..\..\..\test\parsers\native_query.cpp">
<Filter>src\parsers</Filter>
</ClCompile>
Expand All @@ -93,9 +87,6 @@
<ClCompile Include="..\..\..\..\test\protocols\admin\admin_setup_fixture.cpp">
<Filter>src\protocols\admin</Filter>
</ClCompile>
<ClCompile Include="..\..\..\..\test\protocols\bitcoind\bitcoind_json.cpp">
<Filter>src\protocols\bitcoind</Filter>
</ClCompile>
<ClCompile Include="..\..\..\..\test\protocols\bitcoind\bitcoind_rest.cpp">
<Filter>src\protocols\bitcoind</Filter>
</ClCompile>
Expand Down Expand Up @@ -171,12 +162,27 @@
<ClCompile Include="..\..\..\..\test\protocols\native\native_tx.cpp">
<Filter>src\protocols\native</Filter>
</ClCompile>
<ClCompile Include="..\..\..\..\test\serializers\bitcoind_block_stats.cpp">
<Filter>src\serializers</Filter>
</ClCompile>
<ClCompile Include="..\..\..\..\test\serializers\bitcoind_json.cpp">
<Filter>src\serializers</Filter>
</ClCompile>
<ClCompile Include="..\..\..\..\test\settings.cpp">
<Filter>src</Filter>
</ClCompile>
<ClCompile Include="..\..\..\..\test\test.cpp">
<Filter>src</Filter>
</ClCompile>
<ClCompile Include="..\..\..\..\test\utilities\bitcoind_descriptor.cpp">
<Filter>src\utilities</Filter>
</ClCompile>
<ClCompile Include="..\..\..\..\test\utilities\bitcoind_merkle.cpp">
<Filter>src\utilities</Filter>
</ClCompile>
<ClCompile Include="..\..\..\..\test\utilities\electrum_version.cpp">
<Filter>src\utilities</Filter>
</ClCompile>
</ItemGroup>
<ItemGroup>
<ClInclude Include="..\..\..\..\test\mocks\blocks.hpp">
Expand Down
29 changes: 21 additions & 8 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 @@ -129,14 +129,11 @@
<ClCompile Include="..\..\..\..\src\parser.cpp" />
<ClCompile Include="..\..\..\..\src\parsers\admin_query.cpp" />
<ClCompile Include="..\..\..\..\src\parsers\admin_target.cpp" />
<ClCompile Include="..\..\..\..\src\parsers\bitcoind_block_stats.cpp" />
<ClCompile Include="..\..\..\..\src\parsers\bitcoind_descriptor.cpp" />
<ClCompile Include="..\..\..\..\src\parsers\bitcoind_merkle.cpp" />
<ClCompile Include="..\..\..\..\src\parsers\bitcoind_query.cpp" />
<ClCompile Include="..\..\..\..\src\parsers\bitcoind_scan.cpp" />
<ClCompile Include="..\..\..\..\src\parsers\bitcoind_script.cpp" />
<ClCompile Include="..\..\..\..\src\parsers\bitcoind_target.cpp" />
<ClCompile Include="..\..\..\..\src\parsers\btcd_filter.cpp" />
<ClCompile Include="..\..\..\..\src\parsers\electrum_version.cpp" />
<ClCompile Include="..\..\..\..\src\parsers\native_query.cpp" />
<ClCompile Include="..\..\..\..\src\parsers\native_target.cpp" />
<ClCompile Include="..\..\..\..\src\protocols\admin\protocol_admin.cpp" />
Expand Down Expand Up @@ -178,8 +175,16 @@
<ClCompile Include="..\..\..\..\src\protocols\protocol_html.cpp" />
<ClCompile Include="..\..\..\..\src\protocols\protocol_http.cpp" />
<ClCompile Include="..\..\..\..\src\protocols\stratum_v1\protocol_stratum_v1.cpp" />
<ClCompile Include="..\..\..\..\src\serializers\bitcoind_block_stats.cpp" />
<ClCompile Include="..\..\..\..\src\serializers\bitcoind_coin.cpp" />
<ClCompile Include="..\..\..\..\src\serializers\bitcoind_deployments.cpp" />
<ClCompile Include="..\..\..\..\src\serializers\bitcoind_json.cpp" />
<ClCompile Include="..\..\..\..\src\serializers\bitcoind_psbt.cpp" />
<ClCompile Include="..\..\..\..\src\server_node.cpp" />
<ClCompile Include="..\..\..\..\src\settings.cpp" />
<ClCompile Include="..\..\..\..\src\utilities\bitcoind_descriptor.cpp" />
<ClCompile Include="..\..\..\..\src\utilities\bitcoind_merkle.cpp" />
<ClCompile Include="..\..\..\..\src\utilities\electrum_version.cpp" />
</ItemGroup>
<ItemGroup>
<ClInclude Include="..\..\..\..\builds\msvc\resource.h" />
Expand Down Expand Up @@ -218,14 +223,11 @@
<ClInclude Include="..\..\..\..\include\bitcoin\server\parser.hpp" />
<ClInclude Include="..\..\..\..\include\bitcoin\server\parsers\admin_query.hpp" />
<ClInclude Include="..\..\..\..\include\bitcoin\server\parsers\admin_target.hpp" />
<ClInclude Include="..\..\..\..\include\bitcoin\server\parsers\bitcoind_block_stats.hpp" />
<ClInclude Include="..\..\..\..\include\bitcoin\server\parsers\bitcoind_descriptor.hpp" />
<ClInclude Include="..\..\..\..\include\bitcoin\server\parsers\bitcoind_merkle.hpp" />
<ClInclude Include="..\..\..\..\include\bitcoin\server\parsers\bitcoind_query.hpp" />
<ClInclude Include="..\..\..\..\include\bitcoin\server\parsers\bitcoind_scan.hpp" />
<ClInclude Include="..\..\..\..\include\bitcoin\server\parsers\bitcoind_script.hpp" />
<ClInclude Include="..\..\..\..\include\bitcoin\server\parsers\bitcoind_target.hpp" />
<ClInclude Include="..\..\..\..\include\bitcoin\server\parsers\btcd_filter.hpp" />
<ClInclude Include="..\..\..\..\include\bitcoin\server\parsers\electrum_version.hpp" />
<ClInclude Include="..\..\..\..\include\bitcoin\server\parsers\native_query.hpp" />
<ClInclude Include="..\..\..\..\include\bitcoin\server\parsers\native_target.hpp" />
<ClInclude Include="..\..\..\..\include\bitcoin\server\parsers\parsers.hpp" />
Expand Down Expand Up @@ -253,12 +255,23 @@
<ClInclude Include="..\..\..\..\include\bitcoin\server\protocols\protocol_stratum_v1.hpp" />
<ClInclude Include="..\..\..\..\include\bitcoin\server\protocols\protocol_stratum_v2.hpp" />
<ClInclude Include="..\..\..\..\include\bitcoin\server\protocols\protocols.hpp" />
<ClInclude Include="..\..\..\..\include\bitcoin\server\serializers\bitcoind_block_stats.hpp" />
<ClInclude Include="..\..\..\..\include\bitcoin\server\serializers\bitcoind_coin.hpp" />
<ClInclude Include="..\..\..\..\include\bitcoin\server\serializers\bitcoind_data.hpp" />
<ClInclude Include="..\..\..\..\include\bitcoin\server\serializers\bitcoind_deployments.hpp" />
<ClInclude Include="..\..\..\..\include\bitcoin\server\serializers\bitcoind_json.hpp" />
<ClInclude Include="..\..\..\..\include\bitcoin\server\serializers\bitcoind_psbt.hpp" />
<ClInclude Include="..\..\..\..\include\bitcoin\server\serializers\serializers.hpp" />
<ClInclude Include="..\..\..\..\include\bitcoin\server\server_node.hpp" />
<ClInclude Include="..\..\..\..\include\bitcoin\server\sessions\session.hpp" />
<ClInclude Include="..\..\..\..\include\bitcoin\server\sessions\session_handshake.hpp" />
<ClInclude Include="..\..\..\..\include\bitcoin\server\sessions\session_server.hpp" />
<ClInclude Include="..\..\..\..\include\bitcoin\server\sessions\sessions.hpp" />
<ClInclude Include="..\..\..\..\include\bitcoin\server\settings.hpp" />
<ClInclude Include="..\..\..\..\include\bitcoin\server\utilities\bitcoind_descriptor.hpp" />
<ClInclude Include="..\..\..\..\include\bitcoin\server\utilities\bitcoind_merkle.hpp" />
<ClInclude Include="..\..\..\..\include\bitcoin\server\utilities\electrum_version.hpp" />
<ClInclude Include="..\..\..\..\include\bitcoin\server\utilities\utilities.hpp" />
<ClInclude Include="..\..\..\..\include\bitcoin\server\version.hpp" />
</ItemGroup>
<ItemGroup>
Expand Down
Loading
Loading