Skip to content

Adapt explore parser to network IF change, stub handlers. #894

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 5 commits into from
Dec 1, 2025
Merged

Adapt explore parser to network IF change, stub handlers. #894

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
8707bc2
Adapt explore parser to network IF change, stub handlers.
evoskuil Dec 1, 2025
007c92a
Strip query string before parsing target (origin).
evoskuil Dec 1, 2025
d5537bf
Add /transaction/[hash] explore query.
evoskuil Dec 1, 2025
8f64eae
Fix disallowed zero number in target parser.
evoskuil Dec 1, 2025
139b529
Remove witness argument from input.
evoskuil Dec 1, 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
19 changes: 10 additions & 9 deletions Makefile.am
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,8 @@ src_libbitcoin_node_la_SOURCES = \
src/chasers/chaser_template.cpp \
src/chasers/chaser_transaction.cpp \
src/chasers/chaser_validate.cpp \
src/parse/query.cpp \
src/parse/target.cpp \
src/protocols/protocol.cpp \
src/protocols/protocol_block_in_106.cpp \
src/protocols/protocol_block_in_31800.cpp \
Expand All @@ -70,8 +72,6 @@ src_libbitcoin_node_la_SOURCES = \
src/protocols/protocol_performer.cpp \
src/protocols/protocol_transaction_in_106.cpp \
src/protocols/protocol_transaction_out_106.cpp \
src/rest/media.cpp \
src/rest/parse.cpp \
src/sessions/session.cpp \
src/sessions/session_inbound.cpp \
src/sessions/session_manual.cpp \
Expand Down Expand Up @@ -107,9 +107,9 @@ test_libbitcoin_node_test_SOURCES = \
test/chasers/chaser_template.cpp \
test/chasers/chaser_transaction.cpp \
test/chasers/chaser_validate.cpp \
test/parse/query.cpp \
test/parse/target.cpp \
test/protocols/protocol.cpp \
test/rest/media.cpp \
test/rest/parse.cpp \
test/sessions/session.cpp

endif WITH_TESTS
Expand Down Expand Up @@ -200,6 +200,12 @@ include_bitcoin_node_impl_chasersdir = ${includedir}/bitcoin/node/impl/chasers
include_bitcoin_node_impl_chasers_HEADERS = \
include/bitcoin/node/impl/chasers/chaser_organize.ipp

include_bitcoin_node_parsedir = ${includedir}/bitcoin/node/parse
include_bitcoin_node_parse_HEADERS = \
include/bitcoin/node/parse/parse.hpp \
include/bitcoin/node/parse/query.hpp \
include/bitcoin/node/parse/target.hpp

include_bitcoin_node_protocolsdir = ${includedir}/bitcoin/node/protocols
include_bitcoin_node_protocols_HEADERS = \
include/bitcoin/node/protocols/protocol.hpp \
Expand Down Expand Up @@ -229,11 +235,6 @@ include_bitcoin_node_protocols_HEADERS = \
include/bitcoin/node/protocols/protocol_ws.hpp \
include/bitcoin/node/protocols/protocols.hpp

include_bitcoin_node_restdir = ${includedir}/bitcoin/node/rest
include_bitcoin_node_rest_HEADERS = \
include/bitcoin/node/rest/media.hpp \
include/bitcoin/node/rest/parse.hpp

include_bitcoin_node_sessionsdir = ${includedir}/bitcoin/node/sessions
include_bitcoin_node_sessions_HEADERS = \
include/bitcoin/node/sessions/session.hpp \
Expand Down
8 changes: 4 additions & 4 deletions builds/cmake/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -265,6 +265,8 @@ add_library( ${CANONICAL_LIB_NAME}
"../../src/chasers/chaser_template.cpp"
"../../src/chasers/chaser_transaction.cpp"
"../../src/chasers/chaser_validate.cpp"
"../../src/parse/query.cpp"
"../../src/parse/target.cpp"
"../../src/protocols/protocol.cpp"
"../../src/protocols/protocol_block_in_106.cpp"
"../../src/protocols/protocol_block_in_31800.cpp"
Expand All @@ -282,8 +284,6 @@ add_library( ${CANONICAL_LIB_NAME}
"../../src/protocols/protocol_performer.cpp"
"../../src/protocols/protocol_transaction_in_106.cpp"
"../../src/protocols/protocol_transaction_out_106.cpp"
"../../src/rest/media.cpp"
"../../src/rest/parse.cpp"
"../../src/sessions/session.cpp"
"../../src/sessions/session_inbound.cpp"
"../../src/sessions/session_manual.cpp"
Expand Down Expand Up @@ -349,9 +349,9 @@ if (with-tests)
"../../test/chasers/chaser_template.cpp"
"../../test/chasers/chaser_transaction.cpp"
"../../test/chasers/chaser_validate.cpp"
"../../test/parse/query.cpp"
"../../test/parse/target.cpp"
"../../test/protocols/protocol.cpp"
"../../test/rest/media.cpp"
"../../test/rest/parse.cpp"
"../../test/sessions/session.cpp" )

add_test( NAME libbitcoin-node-test COMMAND libbitcoin-node-test
Expand Down
4 changes: 2 additions & 2 deletions builds/msvc/vs2022/libbitcoin-node-test/libbitcoin-node-test.vcxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -134,9 +134,9 @@
<ClCompile Include="..\..\..\..\test\full_node.cpp" />
<ClCompile Include="..\..\..\..\test\main.cpp" />
<ClCompile Include="..\..\..\..\test\node.cpp" />
<ClCompile Include="..\..\..\..\test\parse\query.cpp" />
<ClCompile Include="..\..\..\..\test\parse\target.cpp" />
<ClCompile Include="..\..\..\..\test\protocols\protocol.cpp" />
<ClCompile Include="..\..\..\..\test\rest\media.cpp" />
<ClCompile Include="..\..\..\..\test\rest\parse.cpp" />
<ClCompile Include="..\..\..\..\test\sessions\session.cpp" />
<ClCompile Include="..\..\..\..\test\settings.cpp" />
<ClCompile Include="..\..\..\..\test\test.cpp" />
Expand Down
16 changes: 8 additions & 8 deletions builds/msvc/vs2022/libbitcoin-node-test/libbitcoin-node-test.vcxproj.filters
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,10 +13,10 @@
<Filter Include="src\chasers">
<UniqueIdentifier>{4BD50864-D3BC-4F64-0000-000000000001}</UniqueIdentifier>
</Filter>
<Filter Include="src\protocols">
<Filter Include="src\parse">
<UniqueIdentifier>{4BD50864-D3BC-4F64-0000-000000000002}</UniqueIdentifier>
</Filter>
<Filter Include="src\rest">
<Filter Include="src\protocols">
<UniqueIdentifier>{4BD50864-D3BC-4F64-0000-000000000003}</UniqueIdentifier>
</Filter>
<Filter Include="src\sessions">
Expand Down Expand Up @@ -72,14 +72,14 @@
<ClCompile Include="..\..\..\..\test\node.cpp">
<Filter>src</Filter>
</ClCompile>
<ClCompile Include="..\..\..\..\test\protocols\protocol.cpp">
<Filter>src\protocols</Filter>
<ClCompile Include="..\..\..\..\test\parse\query.cpp">
<Filter>src\parse</Filter>
</ClCompile>
<ClCompile Include="..\..\..\..\test\rest\media.cpp">
<Filter>src\rest</Filter>
<ClCompile Include="..\..\..\..\test\parse\target.cpp">
<Filter>src\parse</Filter>
</ClCompile>
<ClCompile Include="..\..\..\..\test\rest\parse.cpp">
<Filter>src\rest</Filter>
<ClCompile Include="..\..\..\..\test\protocols\protocol.cpp">
<Filter>src\protocols</Filter>
</ClCompile>
<ClCompile Include="..\..\..\..\test\sessions\session.cpp">
<Filter>src\sessions</Filter>
Expand Down
9 changes: 5 additions & 4 deletions builds/msvc/vs2022/libbitcoin-node/libbitcoin-node.vcxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -137,6 +137,8 @@
<ClCompile Include="..\..\..\..\src\configuration.cpp" />
<ClCompile Include="..\..\..\..\src\error.cpp" />
<ClCompile Include="..\..\..\..\src\full_node.cpp" />
<ClCompile Include="..\..\..\..\src\parse\query.cpp" />
<ClCompile Include="..\..\..\..\src\parse\target.cpp" />
<ClCompile Include="..\..\..\..\src\parser.cpp" />
<ClCompile Include="..\..\..\..\src\protocols\protocol.cpp" />
<ClCompile Include="..\..\..\..\src\protocols\protocol_block_in_106.cpp" />
Expand All @@ -155,8 +157,6 @@
<ClCompile Include="..\..\..\..\src\protocols\protocol_performer.cpp" />
<ClCompile Include="..\..\..\..\src\protocols\protocol_transaction_in_106.cpp" />
<ClCompile Include="..\..\..\..\src\protocols\protocol_transaction_out_106.cpp" />
<ClCompile Include="..\..\..\..\src\rest\media.cpp" />
<ClCompile Include="..\..\..\..\src\rest\parse.cpp" />
<ClCompile Include="..\..\..\..\src\sessions\session.cpp" />
<ClCompile Include="..\..\..\..\src\sessions\session_inbound.cpp" />
<ClCompile Include="..\..\..\..\src\sessions\session_manual.cpp" />
Expand Down Expand Up @@ -192,6 +192,9 @@
<ClInclude Include="..\..\..\..\include\bitcoin\node\error.hpp" />
<ClInclude Include="..\..\..\..\include\bitcoin\node\events.hpp" />
<ClInclude Include="..\..\..\..\include\bitcoin\node\full_node.hpp" />
<ClInclude Include="..\..\..\..\include\bitcoin\node\parse\parse.hpp" />
<ClInclude Include="..\..\..\..\include\bitcoin\node\parse\query.hpp" />
<ClInclude Include="..\..\..\..\include\bitcoin\node\parse\target.hpp" />
<ClInclude Include="..\..\..\..\include\bitcoin\node\parser.hpp" />
<ClInclude Include="..\..\..\..\include\bitcoin\node\protocols\protocol.hpp" />
<ClInclude Include="..\..\..\..\include\bitcoin\node\protocols\protocol_bitcoind.hpp" />
Expand Down Expand Up @@ -219,8 +222,6 @@
<ClInclude Include="..\..\..\..\include\bitcoin\node\protocols\protocol_web.hpp" />
<ClInclude Include="..\..\..\..\include\bitcoin\node\protocols\protocol_ws.hpp" />
<ClInclude Include="..\..\..\..\include\bitcoin\node\protocols\protocols.hpp" />
<ClInclude Include="..\..\..\..\include\bitcoin\node\rest\media.hpp" />
<ClInclude Include="..\..\..\..\include\bitcoin\node\rest\parse.hpp" />
<ClInclude Include="..\..\..\..\include\bitcoin\node\sessions\session.hpp" />
<ClInclude Include="..\..\..\..\include\bitcoin\node\sessions\session_inbound.hpp" />
<ClInclude Include="..\..\..\..\include\bitcoin\node\sessions\session_manual.hpp" />
Expand Down
35 changes: 19 additions & 16 deletions builds/msvc/vs2022/libbitcoin-node/libbitcoin-node.vcxproj.filters
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,10 +28,10 @@
<Filter Include="include\bitcoin\node\impl\chasers">
<UniqueIdentifier>{5FFB5F52-0772-4404-0000-00000000000F}</UniqueIdentifier>
</Filter>
<Filter Include="include\bitcoin\node\protocols">
<Filter Include="include\bitcoin\node\parse">
<UniqueIdentifier>{5FFB5F52-0772-4404-0000-00000000000C}</UniqueIdentifier>
</Filter>
<Filter Include="include\bitcoin\node\rest">
<Filter Include="include\bitcoin\node\protocols">
<UniqueIdentifier>{5FFB5F52-0772-4404-0000-00000000000D}</UniqueIdentifier>
</Filter>
<Filter Include="include\bitcoin\node\sessions">
Expand All @@ -49,10 +49,10 @@
<Filter Include="src\chasers">
<UniqueIdentifier>{5FFB5F52-0772-4404-0000-000000000002}</UniqueIdentifier>
</Filter>
<Filter Include="src\protocols">
<Filter Include="src\parse">
<UniqueIdentifier>{5FFB5F52-0772-4404-0000-000000000003}</UniqueIdentifier>
</Filter>
<Filter Include="src\rest">
<Filter Include="src\protocols">
<UniqueIdentifier>{5FFB5F52-0772-4404-0000-000000000004}</UniqueIdentifier>
</Filter>
<Filter Include="src\sessions">
Expand Down Expand Up @@ -108,6 +108,12 @@
<ClCompile Include="..\..\..\..\src\full_node.cpp">
<Filter>src</Filter>
</ClCompile>
<ClCompile Include="..\..\..\..\src\parse\query.cpp">
<Filter>src\parse</Filter>
</ClCompile>
<ClCompile Include="..\..\..\..\src\parse\target.cpp">
<Filter>src\parse</Filter>
</ClCompile>
<ClCompile Include="..\..\..\..\src\parser.cpp">
<Filter>src</Filter>
</ClCompile>
Expand Down Expand Up @@ -162,12 +168,6 @@
<ClCompile Include="..\..\..\..\src\protocols\protocol_transaction_out_106.cpp">
<Filter>src\protocols</Filter>
</ClCompile>
<ClCompile Include="..\..\..\..\src\rest\media.cpp">
<Filter>src\rest</Filter>
</ClCompile>
<ClCompile Include="..\..\..\..\src\rest\parse.cpp">
<Filter>src\rest</Filter>
</ClCompile>
<ClCompile Include="..\..\..\..\src\sessions\session.cpp">
<Filter>src\sessions</Filter>
</ClCompile>
Expand Down Expand Up @@ -269,6 +269,15 @@
<ClInclude Include="..\..\..\..\include\bitcoin\node\full_node.hpp">
<Filter>include\bitcoin\node</Filter>
</ClInclude>
<ClInclude Include="..\..\..\..\include\bitcoin\node\parse\parse.hpp">
<Filter>include\bitcoin\node\parse</Filter>
</ClInclude>
<ClInclude Include="..\..\..\..\include\bitcoin\node\parse\query.hpp">
<Filter>include\bitcoin\node\parse</Filter>
</ClInclude>
<ClInclude Include="..\..\..\..\include\bitcoin\node\parse\target.hpp">
<Filter>include\bitcoin\node\parse</Filter>
</ClInclude>
<ClInclude Include="..\..\..\..\include\bitcoin\node\parser.hpp">
<Filter>include\bitcoin\node</Filter>
</ClInclude>
Expand Down Expand Up @@ -350,12 +359,6 @@
<ClInclude Include="..\..\..\..\include\bitcoin\node\protocols\protocols.hpp">
<Filter>include\bitcoin\node\protocols</Filter>
</ClInclude>
<ClInclude Include="..\..\..\..\include\bitcoin\node\rest\media.hpp">
<Filter>include\bitcoin\node\rest</Filter>
</ClInclude>
<ClInclude Include="..\..\..\..\include\bitcoin\node\rest\parse.hpp">
<Filter>include\bitcoin\node\rest</Filter>
</ClInclude>
<ClInclude Include="..\..\..\..\include\bitcoin\node\sessions\session.hpp">
<Filter>include\bitcoin\node\sessions</Filter>
</ClInclude>
Expand Down
5 changes: 3 additions & 2 deletions include/bitcoin/node.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,9 @@
#include <bitcoin/node/chasers/chaser_transaction.hpp>
#include <bitcoin/node/chasers/chaser_validate.hpp>
#include <bitcoin/node/chasers/chasers.hpp>
#include <bitcoin/node/parse/parse.hpp>
#include <bitcoin/node/parse/query.hpp>
#include <bitcoin/node/parse/target.hpp>
#include <bitcoin/node/protocols/protocol.hpp>
#include <bitcoin/node/protocols/protocol_bitcoind.hpp>
#include <bitcoin/node/protocols/protocol_block_in_106.hpp>
Expand All @@ -71,8 +74,6 @@
#include <bitcoin/node/protocols/protocol_web.hpp>
#include <bitcoin/node/protocols/protocol_ws.hpp>
#include <bitcoin/node/protocols/protocols.hpp>
#include <bitcoin/node/rest/media.hpp>
#include <bitcoin/node/rest/parse.hpp>
#include <bitcoin/node/sessions/session.hpp>
#include <bitcoin/node/sessions/session_inbound.hpp>
#include <bitcoin/node/sessions/session_manual.hpp>
Expand Down
3 changes: 2 additions & 1 deletion include/bitcoin/node/error.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -115,7 +115,8 @@ enum error_t : uint8_t
missing_component,
invalid_component,
invalid_subcomponent,
extra_segment
extra_segment,
unexpected_parse
};

// No current need for error_code equivalence mapping.
Expand Down
25 changes: 25 additions & 0 deletions include/bitcoin/node/parse/parse.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
/**
* Copyright (c) 2011-2025 libbitcoin developers (see AUTHORS)
*
* This file is part of libbitcoin.
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU Affero General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU Affero General Public License for more details.
*
* You should have received a copy of the GNU Affero General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#ifndef LIBBITCOIN_NODE_PARSE_PARSE_HPP
#define LIBBITCOIN_NODE_PARSE_PARSE_HPP

#include <bitcoin/node/parse/query.hpp>
#include <bitcoin/node/parse/target.hpp>

#endif
6 changes: 3 additions & 3 deletions include/bitcoin/node/rest/media.hpp → include/bitcoin/node/parse/query.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,15 +16,15 @@
* You should have received a copy of the GNU Affero General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#ifndef LIBBITCOIN_NODE_MEDIA_HPP
#define LIBBITCOIN_NODE_MEDIA_HPP
#ifndef LIBBITCOIN_NODE_PARSE_QUERY_HPP
#define LIBBITCOIN_NODE_PARSE_QUERY_HPP

#include <bitcoin/node/define.hpp>

namespace libbitcoin {
namespace node {

BCN_API bool get_acceptable_media_type(network::http::media_type& out,
BCN_API bool parse_query(network::rpc::request_t& out,
const network::http::request& request) NOEXCEPT;

} // namespace network
Expand Down
6 changes: 3 additions & 3 deletions include/bitcoin/node/rest/parse.hpp → include/bitcoin/node/parse/target.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,15 +16,15 @@
* You should have received a copy of the GNU Affero General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#ifndef LIBBITCOIN_NODE_PARSE_HPP
#define LIBBITCOIN_NODE_PARSE_HPP
#ifndef LIBBITCOIN_NODE_PARSE_TARGET_HPP
#define LIBBITCOIN_NODE_PARSE_TARGET_HPP

#include <bitcoin/node/define.hpp>

namespace libbitcoin {
namespace node {

BCN_API code parse_request(network::rpc::request_t& out,
BCN_API code parse_target(network::rpc::request_t& out,
const std::string_view& path) NOEXCEPT;

} // namespace network
Expand Down
Loading
Loading