Skip to content

Commit f807296

Browse files
authored
Merge branch 'libbitcoin:master' into master
2 parents b0eaff5 + 7bea26d commit f807296

File tree

16 files changed

+1746
-11
lines changed

16 files changed

+1746
-11
lines changed

Makefile.am

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,10 +63,16 @@ check_PROGRAMS = test/libbitcoin-server-test
6363
test_libbitcoin_server_test_CPPFLAGS = -I${srcdir}/include ${bitcoin_node_BUILD_CPPFLAGS}
6464
test_libbitcoin_server_test_LDADD = src/libbitcoin-server.la ${boost_unit_test_framework_LIBS} ${bitcoin_node_LIBS}
6565
test_libbitcoin_server_test_SOURCES = \
66+
test/configuration.cpp \
6667
test/error.cpp \
6768
test/main.cpp \
69+
test/settings.cpp \
6870
test/test.cpp \
69-
test/test.hpp
71+
test/test.hpp \
72+
test/parsers/bitcoind_query.cpp \
73+
test/parsers/bitcoind_target.cpp \
74+
test/parsers/explore_query.cpp \
75+
test/parsers/explore_target.cpp
7076

7177
endif WITH_TESTS
7278

builds/cmake/CMakeLists.txt

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -286,10 +286,16 @@ target_link_libraries( ${CANONICAL_LIB_NAME}
286286
#------------------------------------------------------------------------------
287287
if (with-tests)
288288
add_executable( libbitcoin-server-test
289+
"../../test/configuration.cpp"
289290
"../../test/error.cpp"
290291
"../../test/main.cpp"
292+
"../../test/settings.cpp"
291293
"../../test/test.cpp"
292-
"../../test/test.hpp" )
294+
"../../test/test.hpp"
295+
"../../test/parsers/bitcoind_query.cpp"
296+
"../../test/parsers/bitcoind_target.cpp"
297+
"../../test/parsers/explore_query.cpp"
298+
"../../test/parsers/explore_target.cpp" )
293299
294300
add_test( NAME libbitcoin-server-test COMMAND libbitcoin-server-test
295301
--run_test=*

builds/msvc/vs2022/bs/bs.vcxproj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -164,7 +164,7 @@
164164
<Import Project="$(NuGetPackageRoot)boost_program_options-vc143.1.86.0\build\boost_program_options-vc143.targets" Condition="Exists('$(NuGetPackageRoot)boost_program_options-vc143.1.86.0\build\boost_program_options-vc143.targets')" />
165165
<Import Project="$(NuGetPackageRoot)boost_thread-vc143.1.86.0\build\boost_thread-vc143.targets" Condition="Exists('$(NuGetPackageRoot)boost_thread-vc143.1.86.0\build\boost_thread-vc143.targets')" />
166166
<Import Project="$(NuGetPackageRoot)boost_url-vc143.1.86.0\build\boost_url-vc143.targets" Condition="Exists('$(NuGetPackageRoot)boost_url-vc143.1.86.0\build\boost_url-vc143.targets')" />
167-
<Import Project="$(NuGetPackageRoot)secp256k1_vc143.0.1.0.21\build\native\secp256k1_vc143.targets" Condition="Exists('$(NuGetPackageRoot)secp256k1_vc143.0.1.0.21\build\native\secp256k1_vc143.targets')" />
167+
<Import Project="$(NuGetPackageRoot)secp256k1_vc143.0.6.1\build\native\secp256k1_vc143.targets" Condition="Exists('$(NuGetPackageRoot)secp256k1_vc143.0.6.1\build\native\secp256k1_vc143.targets')" />
168168
</ImportGroup>
169169
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
170170
<PropertyGroup>
@@ -176,7 +176,7 @@
176176
<Error Condition="!Exists('$(NuGetPackageRoot)boost_program_options-vc143.1.86.0\build\boost_program_options-vc143.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(NuGetPackageRoot)boost_program_options-vc143.1.86.0\build\boost_program_options-vc143.targets'))" />
177177
<Error Condition="!Exists('$(NuGetPackageRoot)boost_thread-vc143.1.86.0\build\boost_thread-vc143.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(NuGetPackageRoot)boost_thread-vc143.1.86.0\build\boost_thread-vc143.targets'))" />
178178
<Error Condition="!Exists('$(NuGetPackageRoot)boost_url-vc143.1.86.0\build\boost_url-vc143.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(NuGetPackageRoot)boost_url-vc143.1.86.0\build\boost_url-vc143.targets'))" />
179-
<Error Condition="!Exists('$(NuGetPackageRoot)secp256k1_vc143.0.1.0.21\build\native\secp256k1_vc143.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(NuGetPackageRoot)secp256k1_vc143.0.1.0.21\build\native\secp256k1_vc143.targets'))" />
179+
<Error Condition="!Exists('$(NuGetPackageRoot)secp256k1_vc143.0.6.1\build\native\secp256k1_vc143.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(NuGetPackageRoot)secp256k1_vc143.0.6.1\build\native\secp256k1_vc143.targets'))" />
180180
</Target>
181181
<ItemGroup>
182182
<ProjectReference Include="..\libbitcoin-server\libbitcoin-server.vcxproj">

builds/msvc/vs2022/bs/packages.config

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,5 +12,5 @@
1212
<package id="boost_program_options-vc143" version="1.86.0" targetFramework="Native" />
1313
<package id="boost_thread-vc143" version="1.86.0" targetFramework="Native" />
1414
<package id="boost_url-vc143" version="1.86.0" targetFramework="Native" />
15-
<package id="secp256k1_vc143" version="0.1.0.21" targetFramework="Native" />
15+
<package id="secp256k1_vc143" version="0.6.1" targetFramework="Native" />
1616
</packages>

builds/msvc/vs2022/libbitcoin-server-test/libbitcoin-server-test.vcxproj

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -118,8 +118,14 @@
118118
<Import Project="$(ProjectDir)$(ProjectName).props" />
119119
</ImportGroup>
120120
<ItemGroup>
121+
<ClCompile Include="..\..\..\..\test\configuration.cpp" />
121122
<ClCompile Include="..\..\..\..\test\error.cpp" />
122123
<ClCompile Include="..\..\..\..\test\main.cpp" />
124+
<ClCompile Include="..\..\..\..\test\parsers\bitcoind_query.cpp" />
125+
<ClCompile Include="..\..\..\..\test\parsers\bitcoind_target.cpp" />
126+
<ClCompile Include="..\..\..\..\test\parsers\explore_query.cpp" />
127+
<ClCompile Include="..\..\..\..\test\parsers\explore_target.cpp" />
128+
<ClCompile Include="..\..\..\..\test\settings.cpp" />
123129
<ClCompile Include="..\..\..\..\test\test.cpp" />
124130
</ItemGroup>
125131
<ItemGroup>
@@ -137,7 +143,7 @@
137143
<Import Project="$(NuGetPackageRoot)boost_program_options-vc143.1.86.0\build\boost_program_options-vc143.targets" Condition="Exists('$(NuGetPackageRoot)boost_program_options-vc143.1.86.0\build\boost_program_options-vc143.targets')" />
138144
<Import Project="$(NuGetPackageRoot)boost_thread-vc143.1.86.0\build\boost_thread-vc143.targets" Condition="Exists('$(NuGetPackageRoot)boost_thread-vc143.1.86.0\build\boost_thread-vc143.targets')" />
139145
<Import Project="$(NuGetPackageRoot)boost_url-vc143.1.86.0\build\boost_url-vc143.targets" Condition="Exists('$(NuGetPackageRoot)boost_url-vc143.1.86.0\build\boost_url-vc143.targets')" />
140-
<Import Project="$(NuGetPackageRoot)secp256k1_vc143.0.1.0.21\build\native\secp256k1_vc143.targets" Condition="Exists('$(NuGetPackageRoot)secp256k1_vc143.0.1.0.21\build\native\secp256k1_vc143.targets')" />
146+
<Import Project="$(NuGetPackageRoot)secp256k1_vc143.0.6.1\build\native\secp256k1_vc143.targets" Condition="Exists('$(NuGetPackageRoot)secp256k1_vc143.0.6.1\build\native\secp256k1_vc143.targets')" />
141147
<Import Project="$(NuGetPackageRoot)boost_unit_test_framework-vc143.1.86.0\build\boost_unit_test_framework-vc143.targets" Condition="Exists('$(NuGetPackageRoot)boost_unit_test_framework-vc143.1.86.0\build\boost_unit_test_framework-vc143.targets')" />
142148
</ImportGroup>
143149
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
@@ -150,7 +156,7 @@
150156
<Error Condition="!Exists('$(NuGetPackageRoot)boost_program_options-vc143.1.86.0\build\boost_program_options-vc143.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(NuGetPackageRoot)boost_program_options-vc143.1.86.0\build\boost_program_options-vc143.targets'))" />
151157
<Error Condition="!Exists('$(NuGetPackageRoot)boost_thread-vc143.1.86.0\build\boost_thread-vc143.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(NuGetPackageRoot)boost_thread-vc143.1.86.0\build\boost_thread-vc143.targets'))" />
152158
<Error Condition="!Exists('$(NuGetPackageRoot)boost_url-vc143.1.86.0\build\boost_url-vc143.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(NuGetPackageRoot)boost_url-vc143.1.86.0\build\boost_url-vc143.targets'))" />
153-
<Error Condition="!Exists('$(NuGetPackageRoot)secp256k1_vc143.0.1.0.21\build\native\secp256k1_vc143.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(NuGetPackageRoot)secp256k1_vc143.0.1.0.21\build\native\secp256k1_vc143.targets'))" />
159+
<Error Condition="!Exists('$(NuGetPackageRoot)secp256k1_vc143.0.6.1\build\native\secp256k1_vc143.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(NuGetPackageRoot)secp256k1_vc143.0.6.1\build\native\secp256k1_vc143.targets'))" />
154160
<Error Condition="!Exists('$(NuGetPackageRoot)boost_unit_test_framework-vc143.1.86.0\build\boost_unit_test_framework-vc143.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(NuGetPackageRoot)boost_unit_test_framework-vc143.1.86.0\build\boost_unit_test_framework-vc143.targets'))" />
155161
</Target>
156162
<ItemGroup>

builds/msvc/vs2022/libbitcoin-server-test/libbitcoin-server-test.vcxproj.filters

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,14 +10,35 @@
1010
<Filter Include="src">
1111
<UniqueIdentifier>{66A0E586-2E3A-448F-0000-000000000000}</UniqueIdentifier>
1212
</Filter>
13+
<Filter Include="src\parsers">
14+
<UniqueIdentifier>{66A0E586-2E3A-448F-0000-000000000001}</UniqueIdentifier>
15+
</Filter>
1316
</ItemGroup>
1417
<ItemGroup>
18+
<ClCompile Include="..\..\..\..\test\configuration.cpp">
19+
<Filter>src</Filter>
20+
</ClCompile>
1521
<ClCompile Include="..\..\..\..\test\error.cpp">
1622
<Filter>src</Filter>
1723
</ClCompile>
1824
<ClCompile Include="..\..\..\..\test\main.cpp">
1925
<Filter>src</Filter>
2026
</ClCompile>
27+
<ClCompile Include="..\..\..\..\test\parsers\bitcoind_query.cpp">
28+
<Filter>src\parsers</Filter>
29+
</ClCompile>
30+
<ClCompile Include="..\..\..\..\test\parsers\bitcoind_target.cpp">
31+
<Filter>src\parsers</Filter>
32+
</ClCompile>
33+
<ClCompile Include="..\..\..\..\test\parsers\explore_query.cpp">
34+
<Filter>src\parsers</Filter>
35+
</ClCompile>
36+
<ClCompile Include="..\..\..\..\test\parsers\explore_target.cpp">
37+
<Filter>src\parsers</Filter>
38+
</ClCompile>
39+
<ClCompile Include="..\..\..\..\test\settings.cpp">
40+
<Filter>src</Filter>
41+
</ClCompile>
2142
<ClCompile Include="..\..\..\..\test\test.cpp">
2243
<Filter>src</Filter>
2344
</ClCompile>

builds/msvc/vs2022/libbitcoin-server-test/packages.config

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,6 @@
1212
<package id="boost_program_options-vc143" version="1.86.0" targetFramework="Native" />
1313
<package id="boost_thread-vc143" version="1.86.0" targetFramework="Native" />
1414
<package id="boost_url-vc143" version="1.86.0" targetFramework="Native" />
15-
<package id="secp256k1_vc143" version="0.1.0.21" targetFramework="Native" />
15+
<package id="secp256k1_vc143" version="0.6.1" targetFramework="Native" />
1616
<package id="boost_unit_test_framework-vc143" version="1.86.0" targetFramework="Native" />
1717
</packages>

builds/msvc/vs2022/libbitcoin-server/libbitcoin-server.vcxproj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -201,7 +201,7 @@
201201
<Import Project="$(NuGetPackageRoot)boost_program_options-vc143.1.86.0\build\boost_program_options-vc143.targets" Condition="Exists('$(NuGetPackageRoot)boost_program_options-vc143.1.86.0\build\boost_program_options-vc143.targets')" />
202202
<Import Project="$(NuGetPackageRoot)boost_thread-vc143.1.86.0\build\boost_thread-vc143.targets" Condition="Exists('$(NuGetPackageRoot)boost_thread-vc143.1.86.0\build\boost_thread-vc143.targets')" />
203203
<Import Project="$(NuGetPackageRoot)boost_url-vc143.1.86.0\build\boost_url-vc143.targets" Condition="Exists('$(NuGetPackageRoot)boost_url-vc143.1.86.0\build\boost_url-vc143.targets')" />
204-
<Import Project="$(NuGetPackageRoot)secp256k1_vc143.0.1.0.21\build\native\secp256k1_vc143.targets" Condition="Exists('$(NuGetPackageRoot)secp256k1_vc143.0.1.0.21\build\native\secp256k1_vc143.targets')" />
204+
<Import Project="$(NuGetPackageRoot)secp256k1_vc143.0.6.1\build\native\secp256k1_vc143.targets" Condition="Exists('$(NuGetPackageRoot)secp256k1_vc143.0.6.1\build\native\secp256k1_vc143.targets')" />
205205
</ImportGroup>
206206
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
207207
<PropertyGroup>
@@ -213,7 +213,7 @@
213213
<Error Condition="!Exists('$(NuGetPackageRoot)boost_program_options-vc143.1.86.0\build\boost_program_options-vc143.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(NuGetPackageRoot)boost_program_options-vc143.1.86.0\build\boost_program_options-vc143.targets'))" />
214214
<Error Condition="!Exists('$(NuGetPackageRoot)boost_thread-vc143.1.86.0\build\boost_thread-vc143.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(NuGetPackageRoot)boost_thread-vc143.1.86.0\build\boost_thread-vc143.targets'))" />
215215
<Error Condition="!Exists('$(NuGetPackageRoot)boost_url-vc143.1.86.0\build\boost_url-vc143.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(NuGetPackageRoot)boost_url-vc143.1.86.0\build\boost_url-vc143.targets'))" />
216-
<Error Condition="!Exists('$(NuGetPackageRoot)secp256k1_vc143.0.1.0.21\build\native\secp256k1_vc143.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(NuGetPackageRoot)secp256k1_vc143.0.1.0.21\build\native\secp256k1_vc143.targets'))" />
216+
<Error Condition="!Exists('$(NuGetPackageRoot)secp256k1_vc143.0.6.1\build\native\secp256k1_vc143.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(NuGetPackageRoot)secp256k1_vc143.0.6.1\build\native\secp256k1_vc143.targets'))" />
217217
</Target>
218218
<ItemGroup>
219219
<Natvis Include="..\..\debug.natvis" />

builds/msvc/vs2022/libbitcoin-server/packages.config

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,5 +12,5 @@
1212
<package id="boost_program_options-vc143" version="1.86.0" targetFramework="Native" />
1313
<package id="boost_thread-vc143" version="1.86.0" targetFramework="Native" />
1414
<package id="boost_url-vc143" version="1.86.0" targetFramework="Native" />
15-
<package id="secp256k1_vc143" version="0.1.0.21" targetFramework="Native" />
15+
<package id="secp256k1_vc143" version="0.6.1" targetFramework="Native" />
1616
</packages>

src/parser.cpp

Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -696,6 +696,21 @@ options_metadata parser::load_settings() THROWS
696696
value<uint32_t>(&configured.network.outbound.seeding_timeout_seconds),
697697
"The time limit for obtaining seed connections and addresses, defaults to '30'."
698698
)
699+
(
700+
"outbound.username",
701+
value<std::string>(&configured.network.outbound.username),
702+
"The socks5 proxy username (optional)."
703+
)
704+
(
705+
"outbound.password",
706+
value<std::string>(&configured.network.outbound.password),
707+
"The socks5 proxy username (optional)."
708+
)
709+
(
710+
"outbound.socks",
711+
value<config::endpoint>(&configured.network.outbound.socks),
712+
"The socks5 proxy endpoint (port required)."
713+
)
699714

700715
/* [inbound] */
701716
////(
@@ -785,6 +800,21 @@ options_metadata parser::load_settings() THROWS
785800
value<network::config::endpoints>(&configured.network.manual.peers),
786801
"A persistent peer node, multiple allowed."
787802
)
803+
(
804+
"manual.username",
805+
value<std::string>(&configured.network.manual.username),
806+
"The socks5 proxy username (optional)."
807+
)
808+
(
809+
"manual.password",
810+
value<std::string>(&configured.network.manual.password),
811+
"The socks5 proxy username (optional)."
812+
)
813+
(
814+
"manual.socks",
815+
value<config::endpoint>(&configured.network.manual.socks),
816+
"The socks5 proxy endpoint (port required)."
817+
)
788818

789819
/* [web] */
790820
////(

0 commit comments

Comments
 (0)