Skip to content

Commit

Permalink
Merge 350ac94 into a64da76
Browse files Browse the repository at this point in the history
  • Loading branch information
@evoskuil
evoskuil committed Nov 29, 2020
2 parents a64da76 + 350ac94 commit 81945a8
Show file tree
Hide file tree
Showing 42 changed files with 201 additions and 162 deletions.
2 changes: 1 addition & 1 deletion .appveyor.yml
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
###############################################################################
# Copyright (c) 2014-2019 libbitcoin-server developers (see COPYING).
# Copyright (c) 2014-2020 libbitcoin-server developers (see COPYING).
#
# GENERATED SOURCE CODE, DO NOT EDIT EXCEPT EXPERIMENTALLY
#
Expand Down
2 changes: 1 addition & 1 deletion .travis.yml
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
###############################################################################
# Copyright (c) 2014-2019 libbitcoin-server developers (see COPYING).
# Copyright (c) 2014-2020 libbitcoin-server developers (see COPYING).
#
# GENERATED SOURCE CODE, DO NOT EDIT EXCEPT EXPERIMENTALLY
#
Expand Down
2 changes: 1 addition & 1 deletion Makefile.am
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
###############################################################################
# Copyright (c) 2014-2019 libbitcoin-server developers (see COPYING).
# Copyright (c) 2014-2020 libbitcoin-server developers (see COPYING).
#
# GENERATED SOURCE CODE, DO NOT EDIT EXCEPT EXPERIMENTALLY
#
Expand Down
2 changes: 1 addition & 1 deletion autogen.sh
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#!/bin/sh
###############################################################################
# Copyright (c) 2014-2019 libbitcoin-server developers (see COPYING).
# Copyright (c) 2014-2020 libbitcoin-server developers (see COPYING).
#
# GENERATED SOURCE CODE, DO NOT EDIT EXCEPT EXPERIMENTALLY
#
Expand Down
2 changes: 1 addition & 1 deletion build.cmd
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
REM ###########################################################################
REM # Copyright (c) 2014-2019 libbitcoin-server developers (see COPYING).
REM # Copyright (c) 2014-2020 libbitcoin-server developers (see COPYING).
REM #
REM # GENERATED SOURCE CODE, DO NOT EDIT EXCEPT EXPERIMENTALLY
REM #
Expand Down
2 changes: 1 addition & 1 deletion builds/cmake/CMakeLists.txt
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
###############################################################################
# Copyright (c) 2014-2019 libbitcoin-server developers (see COPYING).
# Copyright (c) 2014-2020 libbitcoin-server developers (see COPYING).
#
# GENERATED SOURCE CODE, DO NOT EDIT EXCEPT EXPERIMENTALLY
#
Expand Down
2 changes: 1 addition & 1 deletion builds/cmake/modules/FindBash-Completion.cmake
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
###############################################################################
# Copyright (c) 2014-2019 libbitcoin-server developers (see COPYING).
# Copyright (c) 2014-2020 libbitcoin-server developers (see COPYING).
#
# GENERATED SOURCE CODE, DO NOT EDIT EXCEPT EXPERIMENTALLY
#
Expand Down
2 changes: 1 addition & 1 deletion builds/cmake/modules/FindBitcoin-Node.cmake
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
###############################################################################
# Copyright (c) 2014-2019 libbitcoin-server developers (see COPYING).
# Copyright (c) 2014-2020 libbitcoin-server developers (see COPYING).
#
# GENERATED SOURCE CODE, DO NOT EDIT EXCEPT EXPERIMENTALLY
#
Expand Down
2 changes: 1 addition & 1 deletion builds/cmake/modules/FindBitcoin-Protocol.cmake
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
###############################################################################
# Copyright (c) 2014-2019 libbitcoin-server developers (see COPYING).
# Copyright (c) 2014-2020 libbitcoin-server developers (see COPYING).
#
# GENERATED SOURCE CODE, DO NOT EDIT EXCEPT EXPERIMENTALLY
#
Expand Down
2 changes: 1 addition & 1 deletion builds/msvc/vs2013/bs/bs.vcxproj
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
| Copyright (c) 2014-2019 libbitcoin-server developers (see COPYING).
| Copyright (c) 2014-2020 libbitcoin-server developers (see COPYING).
|
| GENERATED SOURCE CODE, DO NOT EDIT EXCEPT EXPERIMENTALLY
|
Expand Down
2 changes: 1 addition & 1 deletion builds/msvc/vs2013/bs/bs.vcxproj.filters
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
| Copyright (c) 2014-2019 libbitcoin-server developers (see COPYING).
| Copyright (c) 2014-2020 libbitcoin-server developers (see COPYING).
|
| GENERATED SOURCE CODE, DO NOT EDIT EXCEPT EXPERIMENTALLY
|
Expand Down
2 changes: 1 addition & 1 deletion builds/msvc/vs2013/bs/packages.config
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
| Copyright (c) 2014-2019 libbitcoin-server developers (see COPYING).
| Copyright (c) 2014-2020 libbitcoin-server developers (see COPYING).
|
| GENERATED SOURCE CODE, DO NOT EDIT EXCEPT EXPERIMENTALLY
|
Expand Down
2 changes: 1 addition & 1 deletion builds/msvc/vs2013/libbitcoin-server-test/libbitcoin-server-test.vcxproj
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
| Copyright (c) 2014-2019 libbitcoin-server developers (see COPYING).
| Copyright (c) 2014-2020 libbitcoin-server developers (see COPYING).
|
| GENERATED SOURCE CODE, DO NOT EDIT EXCEPT EXPERIMENTALLY
|
Expand Down
2 changes: 1 addition & 1 deletion builds/msvc/vs2013/libbitcoin-server-test/libbitcoin-server-test.vcxproj.filters
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
| Copyright (c) 2014-2019 libbitcoin-server developers (see COPYING).
| Copyright (c) 2014-2020 libbitcoin-server developers (see COPYING).
|
| GENERATED SOURCE CODE, DO NOT EDIT EXCEPT EXPERIMENTALLY
|
Expand Down
2 changes: 1 addition & 1 deletion builds/msvc/vs2013/libbitcoin-server-test/packages.config
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
| Copyright (c) 2014-2019 libbitcoin-server developers (see COPYING).
| Copyright (c) 2014-2020 libbitcoin-server developers (see COPYING).
|
| GENERATED SOURCE CODE, DO NOT EDIT EXCEPT EXPERIMENTALLY
|
Expand Down
2 changes: 1 addition & 1 deletion builds/msvc/vs2013/libbitcoin-server/libbitcoin-server.vcxproj
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
| Copyright (c) 2014-2019 libbitcoin-server developers (see COPYING).
| Copyright (c) 2014-2020 libbitcoin-server developers (see COPYING).
|
| GENERATED SOURCE CODE, DO NOT EDIT EXCEPT EXPERIMENTALLY
|
Expand Down
2 changes: 1 addition & 1 deletion builds/msvc/vs2013/libbitcoin-server/libbitcoin-server.vcxproj.filters
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
| Copyright (c) 2014-2019 libbitcoin-server developers (see COPYING).
| Copyright (c) 2014-2020 libbitcoin-server developers (see COPYING).
|
| GENERATED SOURCE CODE, DO NOT EDIT EXCEPT EXPERIMENTALLY
|
Expand Down
2 changes: 1 addition & 1 deletion builds/msvc/vs2013/libbitcoin-server/packages.config
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
| Copyright (c) 2014-2019 libbitcoin-server developers (see COPYING).
| Copyright (c) 2014-2020 libbitcoin-server developers (see COPYING).
|
| GENERATED SOURCE CODE, DO NOT EDIT EXCEPT EXPERIMENTALLY
|
Expand Down
2 changes: 1 addition & 1 deletion builds/msvc/vs2015/bs/bs.vcxproj
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
| Copyright (c) 2014-2019 libbitcoin-server developers (see COPYING).
| Copyright (c) 2014-2020 libbitcoin-server developers (see COPYING).
|
| GENERATED SOURCE CODE, DO NOT EDIT EXCEPT EXPERIMENTALLY
|
Expand Down
2 changes: 1 addition & 1 deletion builds/msvc/vs2015/bs/bs.vcxproj.filters
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
| Copyright (c) 2014-2019 libbitcoin-server developers (see COPYING).
| Copyright (c) 2014-2020 libbitcoin-server developers (see COPYING).
|
| GENERATED SOURCE CODE, DO NOT EDIT EXCEPT EXPERIMENTALLY
|
Expand Down
2 changes: 1 addition & 1 deletion builds/msvc/vs2015/bs/packages.config
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
| Copyright (c) 2014-2019 libbitcoin-server developers (see COPYING).
| Copyright (c) 2014-2020 libbitcoin-server developers (see COPYING).
|
| GENERATED SOURCE CODE, DO NOT EDIT EXCEPT EXPERIMENTALLY
|
Expand Down
2 changes: 1 addition & 1 deletion builds/msvc/vs2015/libbitcoin-server-test/libbitcoin-server-test.vcxproj
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
| Copyright (c) 2014-2019 libbitcoin-server developers (see COPYING).
| Copyright (c) 2014-2020 libbitcoin-server developers (see COPYING).
|
| GENERATED SOURCE CODE, DO NOT EDIT EXCEPT EXPERIMENTALLY
|
Expand Down
2 changes: 1 addition & 1 deletion builds/msvc/vs2015/libbitcoin-server-test/libbitcoin-server-test.vcxproj.filters
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
| Copyright (c) 2014-2019 libbitcoin-server developers (see COPYING).
| Copyright (c) 2014-2020 libbitcoin-server developers (see COPYING).
|
| GENERATED SOURCE CODE, DO NOT EDIT EXCEPT EXPERIMENTALLY
|
Expand Down
2 changes: 1 addition & 1 deletion builds/msvc/vs2015/libbitcoin-server-test/packages.config
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
| Copyright (c) 2014-2019 libbitcoin-server developers (see COPYING).
| Copyright (c) 2014-2020 libbitcoin-server developers (see COPYING).
|
| GENERATED SOURCE CODE, DO NOT EDIT EXCEPT EXPERIMENTALLY
|
Expand Down
2 changes: 1 addition & 1 deletion builds/msvc/vs2015/libbitcoin-server/libbitcoin-server.vcxproj
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
| Copyright (c) 2014-2019 libbitcoin-server developers (see COPYING).
| Copyright (c) 2014-2020 libbitcoin-server developers (see COPYING).
|
| GENERATED SOURCE CODE, DO NOT EDIT EXCEPT EXPERIMENTALLY
|
Expand Down
2 changes: 1 addition & 1 deletion builds/msvc/vs2015/libbitcoin-server/libbitcoin-server.vcxproj.filters
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
| Copyright (c) 2014-2019 libbitcoin-server developers (see COPYING).
| Copyright (c) 2014-2020 libbitcoin-server developers (see COPYING).
|
| GENERATED SOURCE CODE, DO NOT EDIT EXCEPT EXPERIMENTALLY
|
Expand Down
2 changes: 1 addition & 1 deletion builds/msvc/vs2015/libbitcoin-server/packages.config
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
| Copyright (c) 2014-2019 libbitcoin-server developers (see COPYING).
| Copyright (c) 2014-2020 libbitcoin-server developers (see COPYING).
|
| GENERATED SOURCE CODE, DO NOT EDIT EXCEPT EXPERIMENTALLY
|
Expand Down
2 changes: 1 addition & 1 deletion builds/msvc/vs2017/bs/bs.vcxproj
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
| Copyright (c) 2014-2019 libbitcoin-server developers (see COPYING).
| Copyright (c) 2014-2020 libbitcoin-server developers (see COPYING).
|
| GENERATED SOURCE CODE, DO NOT EDIT EXCEPT EXPERIMENTALLY
|
Expand Down
2 changes: 1 addition & 1 deletion builds/msvc/vs2017/bs/bs.vcxproj.filters
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
| Copyright (c) 2014-2019 libbitcoin-server developers (see COPYING).
| Copyright (c) 2014-2020 libbitcoin-server developers (see COPYING).
|
| GENERATED SOURCE CODE, DO NOT EDIT EXCEPT EXPERIMENTALLY
|
Expand Down
2 changes: 1 addition & 1 deletion builds/msvc/vs2017/bs/packages.config
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
| Copyright (c) 2014-2019 libbitcoin-server developers (see COPYING).
| Copyright (c) 2014-2020 libbitcoin-server developers (see COPYING).
|
| GENERATED SOURCE CODE, DO NOT EDIT EXCEPT EXPERIMENTALLY
|
Expand Down
2 changes: 1 addition & 1 deletion builds/msvc/vs2017/libbitcoin-server-test/libbitcoin-server-test.vcxproj
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
| Copyright (c) 2014-2019 libbitcoin-server developers (see COPYING).
| Copyright (c) 2014-2020 libbitcoin-server developers (see COPYING).
|
| GENERATED SOURCE CODE, DO NOT EDIT EXCEPT EXPERIMENTALLY
|
Expand Down
2 changes: 1 addition & 1 deletion builds/msvc/vs2017/libbitcoin-server-test/libbitcoin-server-test.vcxproj.filters
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
| Copyright (c) 2014-2019 libbitcoin-server developers (see COPYING).
| Copyright (c) 2014-2020 libbitcoin-server developers (see COPYING).
|
| GENERATED SOURCE CODE, DO NOT EDIT EXCEPT EXPERIMENTALLY
|
Expand Down
2 changes: 1 addition & 1 deletion builds/msvc/vs2017/libbitcoin-server-test/packages.config
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
| Copyright (c) 2014-2019 libbitcoin-server developers (see COPYING).
| Copyright (c) 2014-2020 libbitcoin-server developers (see COPYING).
|
| GENERATED SOURCE CODE, DO NOT EDIT EXCEPT EXPERIMENTALLY
|
Expand Down
2 changes: 1 addition & 1 deletion builds/msvc/vs2017/libbitcoin-server/libbitcoin-server.vcxproj
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
| Copyright (c) 2014-2019 libbitcoin-server developers (see COPYING).
| Copyright (c) 2014-2020 libbitcoin-server developers (see COPYING).
|
| GENERATED SOURCE CODE, DO NOT EDIT EXCEPT EXPERIMENTALLY
|
Expand Down
2 changes: 1 addition & 1 deletion builds/msvc/vs2017/libbitcoin-server/libbitcoin-server.vcxproj.filters
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
| Copyright (c) 2014-2019 libbitcoin-server developers (see COPYING).
| Copyright (c) 2014-2020 libbitcoin-server developers (see COPYING).
|
| GENERATED SOURCE CODE, DO NOT EDIT EXCEPT EXPERIMENTALLY
|
Expand Down
2 changes: 1 addition & 1 deletion builds/msvc/vs2017/libbitcoin-server/packages.config
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
| Copyright (c) 2014-2019 libbitcoin-server developers (see COPYING).
| Copyright (c) 2014-2020 libbitcoin-server developers (see COPYING).
|
| GENERATED SOURCE CODE, DO NOT EDIT EXCEPT EXPERIMENTALLY
|
Expand Down
8 changes: 3 additions & 5 deletions configure.ac
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
###############################################################################
# Copyright (c) 2014-2019 libbitcoin-server developers (see COPYING).
# Copyright (c) 2014-2020 libbitcoin-server developers (see COPYING).
#
# GENERATED SOURCE CODE, DO NOT EDIT EXCEPT EXPERIMENTALLY
#
Expand Down Expand Up @@ -206,8 +206,7 @@ AC_MSG_NOTICE([bash_completion_BUILD_CPPFLAGS : ${bash_completion_BUILD_CPPFLAGS
PKG_CHECK_MODULES([bitcoin_node], [libbitcoin-node >= 4.0.0],
[bitcoin_node_INCLUDEDIR="`$PKG_CONFIG --variable=includedir "libbitcoin-node >= 4.0.0" 2>/dev/null`"
bitcoin_node_OTHER_CFLAGS="`$PKG_CONFIG --cflags-only-other "libbitcoin-node >= 4.0.0" 2>/dev/null`"],
[bitcoin_node_INCLUDEDIR=""
bitcoin_node_OTHER_CFLAGS=""])
[AC_MSG_ERROR([libbitcoin-node >= 4.0.0 is required but was not found.])])
AC_SUBST([bitcoin_node_PKG], ['libbitcoin-node >= 4.0.0'])
AC_SUBST([bitcoin_node_CPPFLAGS], [${bitcoin_node_CFLAGS}])
AS_IF([test x${bitcoin_node_INCLUDEDIR} != "x"],
Expand All @@ -230,8 +229,7 @@ AC_MSG_NOTICE([bitcoin_node_BUILD_CPPFLAGS : ${bitcoin_node_BUILD_CPPFLAGS}])
PKG_CHECK_MODULES([bitcoin_protocol], [libbitcoin-protocol >= 4.0.0],
[bitcoin_protocol_INCLUDEDIR="`$PKG_CONFIG --variable=includedir "libbitcoin-protocol >= 4.0.0" 2>/dev/null`"
bitcoin_protocol_OTHER_CFLAGS="`$PKG_CONFIG --cflags-only-other "libbitcoin-protocol >= 4.0.0" 2>/dev/null`"],
[bitcoin_protocol_INCLUDEDIR=""
bitcoin_protocol_OTHER_CFLAGS=""])
[AC_MSG_ERROR([libbitcoin-protocol >= 4.0.0 is required but was not found.])])
AC_SUBST([bitcoin_protocol_PKG], ['libbitcoin-protocol >= 4.0.0'])
AC_SUBST([bitcoin_protocol_CPPFLAGS], [${bitcoin_protocol_CFLAGS}])
AS_IF([test x${bitcoin_protocol_INCLUDEDIR} != "x"],
Expand Down
2 changes: 1 addition & 1 deletion include/bitcoin/server.hpp
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
///////////////////////////////////////////////////////////////////////////////
// Copyright (c) 2014-2019 libbitcoin-server developers (see COPYING).
// Copyright (c) 2014-2020 libbitcoin-server developers (see COPYING).
//
// GENERATED SOURCE CODE, DO NOT EDIT EXCEPT EXPERIMENTALLY
//
Expand Down
2 changes: 1 addition & 1 deletion include/bitcoin/server/version.hpp
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
///////////////////////////////////////////////////////////////////////////////
// Copyright (c) 2014-2019 libbitcoin-server developers (see COPYING).
// Copyright (c) 2014-2020 libbitcoin-server developers (see COPYING).
//
// GENERATED SOURCE CODE, DO NOT EDIT EXCEPT EXPERIMENTALLY
//
Expand Down

0 comments on commit 81945a8

Please sign in to comment.