Skip to content

Commit

Permalink
Merge pull request #527 from evoskuil/master
Browse files Browse the repository at this point in the history 
Initial work on speed racheting and stub in chasers.
  • Loading branch information
@evoskuil
evoskuil authored Feb 10, 2024
2 parents 1f87483 + b7964bc commit 657115b
Show file tree
Hide file tree
Showing 52 changed files with 1,541 additions and 253 deletions.
29 changes: 26 additions & 3 deletions Makefile.am
View file
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,12 @@ src_libbitcoin_node_la_SOURCES = \
src/full_node.cpp \
src/parser.cpp \
src/settings.cpp \
src/chasers/chaser.cpp \
src/chasers/chaser_check.cpp \
src/chasers/chaser_confirm.cpp \
src/chasers/chaser_connect.cpp \
src/chasers/chaser_header.cpp \
src/chasers/chaser_transaction.cpp \
src/protocols/protocol.cpp \
src/protocols/protocol_block_in.cpp \
src/protocols/protocol_block_out.cpp \
Expand All @@ -49,7 +55,10 @@ src_libbitcoin_node_la_SOURCES = \
src/protocols/protocol_header_out_70012.cpp \
src/protocols/protocol_transaction_in.cpp \
src/protocols/protocol_transaction_out.cpp \
src/sessions/session.cpp
src/sessions/session.cpp \
src/sessions/session_inbound.cpp \
src/sessions/session_manual.cpp \
src/sessions/session_outbound.cpp

# local: test/libbitcoin-node-test
#------------------------------------------------------------------------------
Expand Down Expand Up @@ -104,9 +113,18 @@ include_bitcoin_node_HEADERS = \
include/bitcoin/node/settings.hpp \
include/bitcoin/node/version.hpp

include_bitcoin_node_chasersdir = ${includedir}/bitcoin/node/chasers
include_bitcoin_node_chasers_HEADERS = \
include/bitcoin/node/chasers/chaser.hpp \
include/bitcoin/node/chasers/chaser_check.hpp \
include/bitcoin/node/chasers/chaser_confirm.hpp \
include/bitcoin/node/chasers/chaser_connect.hpp \
include/bitcoin/node/chasers/chaser_header.hpp \
include/bitcoin/node/chasers/chaser_transaction.hpp \
include/bitcoin/node/chasers/chasers.hpp

include_bitcoin_node_protocolsdir = ${includedir}/bitcoin/node/protocols
include_bitcoin_node_protocols_HEADERS = \
include/bitcoin/node/protocols/mixin.hpp \
include/bitcoin/node/protocols/protocol.hpp \
include/bitcoin/node/protocols/protocol_block_in.hpp \
include/bitcoin/node/protocols/protocol_block_out.hpp \
Expand All @@ -120,7 +138,12 @@ include_bitcoin_node_protocols_HEADERS = \

include_bitcoin_node_sessionsdir = ${includedir}/bitcoin/node/sessions
include_bitcoin_node_sessions_HEADERS = \
include/bitcoin/node/sessions/session.hpp
include/bitcoin/node/sessions/attach.hpp \
include/bitcoin/node/sessions/session.hpp \
include/bitcoin/node/sessions/session_inbound.hpp \
include/bitcoin/node/sessions/session_manual.hpp \
include/bitcoin/node/sessions/session_outbound.hpp \
include/bitcoin/node/sessions/sessions.hpp

# files => ${bash_completiondir}
#------------------------------------------------------------------------------
Expand Down
11 changes: 10 additions & 1 deletion builds/cmake/CMakeLists.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -250,6 +250,12 @@ add_library( ${CANONICAL_LIB_NAME}
"../../src/full_node.cpp"
"../../src/parser.cpp"
"../../src/settings.cpp"
"../../src/chasers/chaser.cpp"
"../../src/chasers/chaser_check.cpp"
"../../src/chasers/chaser_confirm.cpp"
"../../src/chasers/chaser_connect.cpp"
"../../src/chasers/chaser_header.cpp"
"../../src/chasers/chaser_transaction.cpp"
"../../src/protocols/protocol.cpp"
"../../src/protocols/protocol_block_in.cpp"
"../../src/protocols/protocol_block_out.cpp"
Expand All @@ -259,7 +265,10 @@ add_library( ${CANONICAL_LIB_NAME}
"../../src/protocols/protocol_header_out_70012.cpp"
"../../src/protocols/protocol_transaction_in.cpp"
"../../src/protocols/protocol_transaction_out.cpp"
"../../src/sessions/session.cpp" )
"../../src/sessions/session.cpp"
"../../src/sessions/session_inbound.cpp"
"../../src/sessions/session_manual.cpp"
"../../src/sessions/session_outbound.cpp" )

# ${CANONICAL_LIB_NAME} project specific include directory normalization for build.
#------------------------------------------------------------------------------
Expand Down
22 changes: 21 additions & 1 deletion builds/msvc/vs2022/libbitcoin-node/libbitcoin-node.vcxproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -73,6 +73,12 @@
<Import Project="$(ProjectDir)$(ProjectName).props" />
</ImportGroup>
<ItemGroup>
<ClCompile Include="..\..\..\..\src\chasers\chaser.cpp" />
<ClCompile Include="..\..\..\..\src\chasers\chaser_check.cpp" />
<ClCompile Include="..\..\..\..\src\chasers\chaser_confirm.cpp" />
<ClCompile Include="..\..\..\..\src\chasers\chaser_connect.cpp" />
<ClCompile Include="..\..\..\..\src\chasers\chaser_header.cpp" />
<ClCompile Include="..\..\..\..\src\chasers\chaser_transaction.cpp" />
<ClCompile Include="..\..\..\..\src\configuration.cpp" />
<ClCompile Include="..\..\..\..\src\error.cpp" />
<ClCompile Include="..\..\..\..\src\full_node.cpp" />
Expand All @@ -87,16 +93,25 @@
<ClCompile Include="..\..\..\..\src\protocols\protocol_transaction_in.cpp" />
<ClCompile Include="..\..\..\..\src\protocols\protocol_transaction_out.cpp" />
<ClCompile Include="..\..\..\..\src\sessions\session.cpp" />
<ClCompile Include="..\..\..\..\src\sessions\session_inbound.cpp" />
<ClCompile Include="..\..\..\..\src\sessions\session_manual.cpp" />
<ClCompile Include="..\..\..\..\src\sessions\session_outbound.cpp" />
<ClCompile Include="..\..\..\..\src\settings.cpp" />
</ItemGroup>
<ItemGroup>
<ClInclude Include="..\..\..\..\include\bitcoin\node.hpp" />
<ClInclude Include="..\..\..\..\include\bitcoin\node\chasers\chaser.hpp" />
<ClInclude Include="..\..\..\..\include\bitcoin\node\chasers\chaser_check.hpp" />
<ClInclude Include="..\..\..\..\include\bitcoin\node\chasers\chaser_confirm.hpp" />
<ClInclude Include="..\..\..\..\include\bitcoin\node\chasers\chaser_connect.hpp" />
<ClInclude Include="..\..\..\..\include\bitcoin\node\chasers\chaser_header.hpp" />
<ClInclude Include="..\..\..\..\include\bitcoin\node\chasers\chaser_transaction.hpp" />
<ClInclude Include="..\..\..\..\include\bitcoin\node\chasers\chasers.hpp" />
<ClInclude Include="..\..\..\..\include\bitcoin\node\configuration.hpp" />
<ClInclude Include="..\..\..\..\include\bitcoin\node\define.hpp" />
<ClInclude Include="..\..\..\..\include\bitcoin\node\error.hpp" />
<ClInclude Include="..\..\..\..\include\bitcoin\node\full_node.hpp" />
<ClInclude Include="..\..\..\..\include\bitcoin\node\parser.hpp" />
<ClInclude Include="..\..\..\..\include\bitcoin\node\protocols\mixin.hpp" />
<ClInclude Include="..\..\..\..\include\bitcoin\node\protocols\protocol.hpp" />
<ClInclude Include="..\..\..\..\include\bitcoin\node\protocols\protocol_block_in.hpp" />
<ClInclude Include="..\..\..\..\include\bitcoin\node\protocols\protocol_block_out.hpp" />
Expand All @@ -107,7 +122,12 @@
<ClInclude Include="..\..\..\..\include\bitcoin\node\protocols\protocol_transaction_in.hpp" />
<ClInclude Include="..\..\..\..\include\bitcoin\node\protocols\protocol_transaction_out.hpp" />
<ClInclude Include="..\..\..\..\include\bitcoin\node\protocols\protocols.hpp" />
<ClInclude Include="..\..\..\..\include\bitcoin\node\sessions\attach.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" />
<ClInclude Include="..\..\..\..\include\bitcoin\node\sessions\session_outbound.hpp" />
<ClInclude Include="..\..\..\..\include\bitcoin\node\sessions\sessions.hpp" />
<ClInclude Include="..\..\..\..\include\bitcoin\node\settings.hpp" />
<ClInclude Include="..\..\..\..\include\bitcoin\node\version.hpp" />
<ClInclude Include="..\..\resource.h" />
Expand Down
88 changes: 77 additions & 11 deletions builds/msvc/vs2022/libbitcoin-node/libbitcoin-node.vcxproj.filters
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,34 +8,58 @@
<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup>
<Filter Include="include">
<UniqueIdentifier>{5FFB5F52-0772-4404-0000-000000000003}</UniqueIdentifier>
<UniqueIdentifier>{5FFB5F52-0772-4404-0000-000000000004}</UniqueIdentifier>
</Filter>
<Filter Include="include\bitcoin">
<UniqueIdentifier>{5FFB5F52-0772-4404-0000-000000000004}</UniqueIdentifier>
<UniqueIdentifier>{5FFB5F52-0772-4404-0000-000000000005}</UniqueIdentifier>
</Filter>
<Filter Include="include\bitcoin\node">
<UniqueIdentifier>{5FFB5F52-0772-4404-0000-000000000005}</UniqueIdentifier>
<UniqueIdentifier>{5FFB5F52-0772-4404-0000-000000000006}</UniqueIdentifier>
</Filter>
<Filter Include="include\bitcoin\node\chasers">
<UniqueIdentifier>{5FFB5F52-0772-4404-0000-000000000007}</UniqueIdentifier>
</Filter>
<Filter Include="include\bitcoin\node\protocols">
<UniqueIdentifier>{5FFB5F52-0772-4404-0000-000000000006}</UniqueIdentifier>
<UniqueIdentifier>{5FFB5F52-0772-4404-0000-000000000008}</UniqueIdentifier>
</Filter>
<Filter Include="include\bitcoin\node\sessions">
<UniqueIdentifier>{5FFB5F52-0772-4404-0000-000000000007}</UniqueIdentifier>
<UniqueIdentifier>{5FFB5F52-0772-4404-0000-000000000009}</UniqueIdentifier>
</Filter>
<Filter Include="resource">
<UniqueIdentifier>{5FFB5F52-0772-4404-0000-000000000008}</UniqueIdentifier>
<UniqueIdentifier>{5FFB5F52-0772-4404-0000-00000000000A}</UniqueIdentifier>
</Filter>
<Filter Include="src">
<UniqueIdentifier>{5FFB5F52-0772-4404-0000-000000000000}</UniqueIdentifier>
</Filter>
<Filter Include="src\protocols">
<Filter Include="src\chasers">
<UniqueIdentifier>{5FFB5F52-0772-4404-0000-000000000001}</UniqueIdentifier>
</Filter>
<Filter Include="src\sessions">
<Filter Include="src\protocols">
<UniqueIdentifier>{5FFB5F52-0772-4404-0000-000000000002}</UniqueIdentifier>
</Filter>
<Filter Include="src\sessions">
<UniqueIdentifier>{5FFB5F52-0772-4404-0000-000000000003}</UniqueIdentifier>
</Filter>
</ItemGroup>
<ItemGroup>
<ClCompile Include="..\..\..\..\src\chasers\chaser.cpp">
<Filter>src\chasers</Filter>
</ClCompile>
<ClCompile Include="..\..\..\..\src\chasers\chaser_check.cpp">
<Filter>src\chasers</Filter>
</ClCompile>
<ClCompile Include="..\..\..\..\src\chasers\chaser_confirm.cpp">
<Filter>src\chasers</Filter>
</ClCompile>
<ClCompile Include="..\..\..\..\src\chasers\chaser_connect.cpp">
<Filter>src\chasers</Filter>
</ClCompile>
<ClCompile Include="..\..\..\..\src\chasers\chaser_header.cpp">
<Filter>src\chasers</Filter>
</ClCompile>
<ClCompile Include="..\..\..\..\src\chasers\chaser_transaction.cpp">
<Filter>src\chasers</Filter>
</ClCompile>
<ClCompile Include="..\..\..\..\src\configuration.cpp">
<Filter>src</Filter>
</ClCompile>
Expand Down Expand Up @@ -78,6 +102,15 @@
<ClCompile Include="..\..\..\..\src\sessions\session.cpp">
<Filter>src\sessions</Filter>
</ClCompile>
<ClCompile Include="..\..\..\..\src\sessions\session_inbound.cpp">
<Filter>src\sessions</Filter>
</ClCompile>
<ClCompile Include="..\..\..\..\src\sessions\session_manual.cpp">
<Filter>src\sessions</Filter>
</ClCompile>
<ClCompile Include="..\..\..\..\src\sessions\session_outbound.cpp">
<Filter>src\sessions</Filter>
</ClCompile>
<ClCompile Include="..\..\..\..\src\settings.cpp">
<Filter>src</Filter>
</ClCompile>
Expand All @@ -86,6 +119,27 @@
<ClInclude Include="..\..\..\..\include\bitcoin\node.hpp">
<Filter>include\bitcoin</Filter>
</ClInclude>
<ClInclude Include="..\..\..\..\include\bitcoin\node\chasers\chaser.hpp">
<Filter>include\bitcoin\node\chasers</Filter>
</ClInclude>
<ClInclude Include="..\..\..\..\include\bitcoin\node\chasers\chaser_check.hpp">
<Filter>include\bitcoin\node\chasers</Filter>
</ClInclude>
<ClInclude Include="..\..\..\..\include\bitcoin\node\chasers\chaser_confirm.hpp">
<Filter>include\bitcoin\node\chasers</Filter>
</ClInclude>
<ClInclude Include="..\..\..\..\include\bitcoin\node\chasers\chaser_connect.hpp">
<Filter>include\bitcoin\node\chasers</Filter>
</ClInclude>
<ClInclude Include="..\..\..\..\include\bitcoin\node\chasers\chaser_header.hpp">
<Filter>include\bitcoin\node\chasers</Filter>
</ClInclude>
<ClInclude Include="..\..\..\..\include\bitcoin\node\chasers\chaser_transaction.hpp">
<Filter>include\bitcoin\node\chasers</Filter>
</ClInclude>
<ClInclude Include="..\..\..\..\include\bitcoin\node\chasers\chasers.hpp">
<Filter>include\bitcoin\node\chasers</Filter>
</ClInclude>
<ClInclude Include="..\..\..\..\include\bitcoin\node\configuration.hpp">
<Filter>include\bitcoin\node</Filter>
</ClInclude>
Expand All @@ -101,9 +155,6 @@
<ClInclude Include="..\..\..\..\include\bitcoin\node\parser.hpp">
<Filter>include\bitcoin\node</Filter>
</ClInclude>
<ClInclude Include="..\..\..\..\include\bitcoin\node\protocols\mixin.hpp">
<Filter>include\bitcoin\node\protocols</Filter>
</ClInclude>
<ClInclude Include="..\..\..\..\include\bitcoin\node\protocols\protocol.hpp">
<Filter>include\bitcoin\node\protocols</Filter>
</ClInclude>
Expand Down Expand Up @@ -134,9 +185,24 @@
<ClInclude Include="..\..\..\..\include\bitcoin\node\protocols\protocols.hpp">
<Filter>include\bitcoin\node\protocols</Filter>
</ClInclude>
<ClInclude Include="..\..\..\..\include\bitcoin\node\sessions\attach.hpp">
<Filter>include\bitcoin\node\sessions</Filter>
</ClInclude>
<ClInclude Include="..\..\..\..\include\bitcoin\node\sessions\session.hpp">
<Filter>include\bitcoin\node\sessions</Filter>
</ClInclude>
<ClInclude Include="..\..\..\..\include\bitcoin\node\sessions\session_inbound.hpp">
<Filter>include\bitcoin\node\sessions</Filter>
</ClInclude>
<ClInclude Include="..\..\..\..\include\bitcoin\node\sessions\session_manual.hpp">
<Filter>include\bitcoin\node\sessions</Filter>
</ClInclude>
<ClInclude Include="..\..\..\..\include\bitcoin\node\sessions\session_outbound.hpp">
<Filter>include\bitcoin\node\sessions</Filter>
</ClInclude>
<ClInclude Include="..\..\..\..\include\bitcoin\node\sessions\sessions.hpp">
<Filter>include\bitcoin\node\sessions</Filter>
</ClInclude>
<ClInclude Include="..\..\..\..\include\bitcoin\node\settings.hpp">
<Filter>include\bitcoin\node</Filter>
</ClInclude>
Expand Down
Loading

0 comments on commit 657115b

Please sign in to comment.