Merge version 0.2.5.17 from dev

Merge version 0.2.5.17 from dev

COPYING

@@ -0,0 +1,26 @@
+The MIT License (MIT)
+
+Copyright (c) 2009 Satoshi Nakamoto
+Copyright (c) 2009-2016 Bitcoin Developers
+Copyright (c) 2009-2016 The Bitcoin Core developers
+Copyright (c) 2015-2019 The Bitcoin Unlimited developers
+Copyright (c) 2014-2019 The Eccoin developers
+
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.

configure.ac

@@ -12,7 +12,7 @@ AC_PREREQ([2.60])
 define(_CLIENT_VERSION_MAJOR, 0)
 define(_CLIENT_VERSION_MINOR, 2)
 define(_CLIENT_VERSION_REVISION, 5)
-define(_CLIENT_VERSION_BUILD, 16)  # version 99 here indicates an unreleased version
+define(_CLIENT_VERSION_BUILD, 17)  # version 99 here indicates an unreleased version
 define(_CLIENT_VERSION_IS_RELEASE, true)
 define(_COPYRIGHT_YEAR, 2019)
 define(_COPYRIGHT_HOLDERS,[The %s developers])

contrib/gitian-descriptors/gitian-arm.yml

@@ -1,5 +1,5 @@
 ---
-name: "eccoin-linux-0.2.5.16"
+name: "eccoin-linux-0.2.5.17"
 enable_cache: true
 suites:
 - "bionic"

contrib/gitian-descriptors/gitian-linux.yml

@@ -1,5 +1,5 @@
 ---
-name: "eccoin-linux-0.2.5.16"
+name: "eccoin-linux-0.2.5.17"
 enable_cache: true
 suites:
 - "bionic"

contrib/gitian-descriptors/gitian-osx.yml

@@ -1,5 +1,5 @@
 ---
-name: "eccoin-osx-0.2.5.16"
+name: "eccoin-osx-0.2.5.17"
 enable_cache: true
 suites:
 - "bionic"

contrib/gitian-descriptors/gitian-win.yml

@@ -1,5 +1,5 @@
 ---
-name: "eccoin-win-0.2.5.16"
+name: "eccoin-win-0.2.5.17"
 enable_cache: true
 suites:
 - "bionic"

qa/pull-tester/rpc-tests.py

@@ -197,7 +197,7 @@ def option_passed(option_without_dashes):
     'txpropagate',
     'verifydb',
     'wallet',
-    'walletbackup',
+    Disabled('walletbackup', "TIMEOUT"), # issue with restarting nodes mid test
     'zapwallettxes',
     #
     Disabled('mempool_limit', "FAILS"),

qa/rpc-tests/listtransactions.py

@@ -36,9 +36,13 @@ def setup_network(self, split=False):
         self.sync_all()
 
     def run_test(self):
-        self.nodes[0].generate(100)
+        for i in range (4):
+            self.nodes[0].generate(25)
+            self.sync_all()
         self.sync_all()
-        self.nodes[1].generate(100)
+        for i in range (4):
+            self.nodes[1].generate(25)
+            self.sync_all()
         self.sync_all()
         # Simple send, 0 to 1:
         txid = self.nodes[0].sendtoaddress(self.nodes[1].getnewaddress(), 0.1)

qa/rpc-tests/verifydb.py

@@ -54,38 +54,54 @@ def run_test (self):
             j = randint(1, 5)
             for k in range(j):
                 self.nodes[1].sendtoaddress(self.nodes[0].getnewaddress(), 1)
+            if i % 10 == 0:
+                self.sync_all()
         self.sync_all()
+
         #get to 500 blocks
         for i in range (100):
             self.nodes[0].generate(1)
             j = randint(1, 5)
             for k in range(j):
                 self.nodes[0].sendtoaddress(self.nodes[1].getnewaddress(), 1)
+            if i % 50 == 0:
+                self.sync_all()
         self.sync_all()
+
         for i in range (100):
             self.nodes[1].generate(1)
             j = randint(1, 5)
             for k in range(j):
                 self.nodes[1].sendtoaddress(self.nodes[0].getnewaddress(), 1)
+            if i % 50 == 0:
+                self.sync_all()
         self.sync_all()
+
         for i in range (100):
             self.nodes[0].generate(1)
             j = randint(1, 5)
             for k in range(j):
                 self.nodes[0].sendtoaddress(self.nodes[1].getnewaddress(), 1)
+            if i % 50 == 0:
+                self.sync_all()
         self.sync_all()
+
         for i in range (100):
             self.nodes[1].generate(1)
             j = randint(1, 5)
             for k in range(j):
                 self.nodes[1].sendtoaddress(self.nodes[0].getnewaddress(), 1)
+            if i % 50 == 0:
+                self.sync_all()
         self.sync_all()
         #pos blocks
         for i in range (100):
             self.nodes[1].generatepos(1)
             j = randint(1, 5)
             for k in range(j):
                 self.nodes[1].sendtoaddress(self.nodes[0].getnewaddress(), 1)
+            if i % 10 == 0:
+                self.sync_all()
         self.sync_all()
 
         #stop the nodes

qa/rpc-tests/wallet.py

@@ -186,7 +186,7 @@ def run_test (self):
         sync_mempools(self.nodes)
 
         self.nodes.append(start_node(3, self.options.tmpdir, ['-usehd=0']))
-        connect_nodes_bi(self.nodes, 0, 3)
+        interconnect_nodes(self.nodes)
         sync_blocks(self.nodes)
 
         relayed = self.nodes[0].resendwallettransactions()

qa/rpc-tests/walletbackup.py

@@ -49,7 +49,7 @@ def setup_chain(self):
     # This mirrors how the network was setup in the bash test
     def setup_network(self, split=False):
         # nodes 1, 2,3 are spenders, let's give them a keypool=100
-        extra_args = [["-keypool=100"], ["-keypool=100"], ["-keypool=100"], []]
+        extra_args = [["-keypool=100", "-debug=net"], ["-keypool=100", "-debug=net"], ["-keypool=100", "-debug=net"], []]
         self.nodes = start_nodes(4, self.options.tmpdir, extra_args)
         connect_nodes(self.nodes[0], 3)
         connect_nodes(self.nodes[1], 3)
@@ -135,7 +135,10 @@ def run_test(self):
             self.do_one_round()
 
         # Generate 101 more blocks, so any fees paid mature
-        self.nodes[3].generate(101)
+        self.nodes[3].generate(1)
+        self.sync_all()
+        for i in range(4):
+            self.nodes[3].generate(25)
         self.sync_all()
 
         balance0 = self.nodes[0].getbalance()

src/.formatted-files

@@ -159,6 +159,8 @@ support/pagelocker.cpp
 support/pagelocker.h
 sync.cpp
 sync.h
+threaddeadlock.cpp
+threaddeadlock.h
 threadgroup.h
 threadsafety.h
 timedata.cpp
@@ -216,6 +218,12 @@ test/coins_tests.cpp
 test/compress_tests.cpp
 test/crypto_tests.cpp
 test/dbwrapper_tests.cpp
+test/deadlock_tests/test1-4.cpp
+test/deadlock_tests/test5.cpp
+test/deadlock_tests/test6.cpp
+test/deadlock_tests/test7.cpp
+test/deadlock_tests/test8.cpp
+test/deadlock_tests/suite.h
 test/DoS_tests.cpp
 test/exploit_tests.cpp
 test/getarg_tests.cpp

src/Makefile.am

@@ -135,7 +135,7 @@ BITCOIN_CORE_H = \
   support/cleanse.h \
   support/pagelocker.h \
   sync.h \
-  sync_rsm.h \
+  threaddeadlock.h \
   threadgroup.h \
   threadsafety.h \
   timedata.h \
@@ -175,8 +175,8 @@ libbitcoin_server_a_CPPFLAGS = $(AM_CPPFLAGS) $(BITCOIN_INCLUDES) $(MINIUPNPC_CP
 libbitcoin_server_a_CXXFLAGS = $(AM_CXXFLAGS) $(PIC_FLAGS) $(PIE_FLAGS)
 libbitcoin_server_a_SOURCES = \
   globals.cpp \
+  threaddeadlock.cpp \
   sync.cpp \
-  sync_rsm.cpp \
   net/addrdb.cpp \
   net/addrman.cpp \
   blockgeneration/blockgeneration.cpp \

src/Makefile.bench.include

@@ -21,6 +21,7 @@ bench_bench_bitcoin_LDADD = \
   $(LIBLEVELDB) \
   $(LIBLEVELDB_SSE42) \
   $(LIBMEMENV) \
+  $(LIBRSM) \
   $(LIBSECP256K1)
 
 if ENABLE_ZMQ

src/Makefile.test.include

@@ -67,6 +67,12 @@ BITCOIN_TESTS = \
   test/compress_tests.cpp \
   test/crypto_tests.cpp \
   test/dbwrapper_tests.cpp \
+  test/deadlock_tests/test1-4.cpp \
+  test/deadlock_tests/test5.cpp \
+  test/deadlock_tests/test6.cpp \
+  test/deadlock_tests/test7.cpp \
+  test/deadlock_tests/test8.cpp \
+  test/deadlock_tests/suite.h \
   test/getarg_tests.cpp \
   test/jsonutil.h \
   test/jsonutil.cpp \

src/amount.cpp

@@ -1,22 +1,9 @@
-/*
- * This file is part of the Eccoin project
- * Copyright (c) 2009-2010 Satoshi Nakamoto
- * Copyright (c) 2009-2016 The Bitcoin Core developers
- * Copyright (c) 2014-2018 The Eccoin developers
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU 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 General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
+// This file is part of the Eccoin project
+// Copyright (c) 2009-2010 Satoshi Nakamoto
+// Copyright (c) 2009-2016 The Bitcoin Core developers
+// Copyright (c) 2014-2018 The Eccoin developers
+// Distributed under the MIT software license, see the accompanying
+// file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
 #include "amount.h"
 

src/amount.h

@@ -1,22 +1,9 @@
-/*
- * This file is part of the Eccoin project
- * Copyright (c) 2009-2010 Satoshi Nakamoto
- * Copyright (c) 2009-2016 The Bitcoin Core developers
- * Copyright (c) 2014-2018 The Eccoin developers
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU 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 General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
+// This file is part of the Eccoin project
+// Copyright (c) 2009-2010 Satoshi Nakamoto
+// Copyright (c) 2009-2016 The Bitcoin Core developers
+// Copyright (c) 2014-2018 The Eccoin developers
+// Distributed under the MIT software license, see the accompanying
+// file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
 #ifndef BITCOIN_AMOUNT_H
 #define BITCOIN_AMOUNT_H

src/args.cpp

@@ -1,22 +1,9 @@
-/*
- * This file is part of the Eccoin project
- * Copyright (c) 2009-2010 Satoshi Nakamoto
- * Copyright (c) 2009-2016 The Bitcoin Core developers
- * Copyright (c) 2014-2018 The Eccoin developers
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU 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 General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
+// This file is part of the Eccoin project
+// Copyright (c) 2009-2010 Satoshi Nakamoto
+// Copyright (c) 2009-2016 The Bitcoin Core developers
+// Copyright (c) 2014-2018 The Eccoin developers
+// Distributed under the MIT software license, see the accompanying
+// file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
 #include "args.h"
 #include "util/util.h"
@@ -219,9 +206,9 @@ void CArgsManager::ForceSetArg(const std::string &strArg, const std::string &str
     mapMultiArgs[strArg].push_back(strValue);
 }
 
-static fs::path pathCached;
-static fs::path pathCachedNetSpecific;
-static CCriticalSection csPathCached;
+extern fs::path pathCached;
+extern fs::path pathCachedNetSpecific;
+extern CCriticalSection csPathCached;
 
 fs::path CArgsManager::GetConfigFile()
 {

src/args.h

@@ -1,22 +1,9 @@
-/*
- * This file is part of the Eccoin project
- * Copyright (c) 2009-2010 Satoshi Nakamoto
- * Copyright (c) 2009-2016 The Bitcoin Core developers
- * Copyright (c) 2014-2018 The Eccoin developers
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU 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 General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
+// This file is part of the Eccoin project
+// Copyright (c) 2009-2010 Satoshi Nakamoto
+// Copyright (c) 2009-2016 The Bitcoin Core developers
+// Copyright (c) 2014-2018 The Eccoin developers
+// Distributed under the MIT software license, see the accompanying
+// file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
 #ifndef ECCOIN_ARGS_H
 #define ECCOIN_ARGS_H

src/arith_uint256.cpp

@@ -1,22 +1,9 @@
-/*
- * This file is part of the Eccoin project
- * Copyright (c) 2009-2010 Satoshi Nakamoto
- * Copyright (c) 2009-2016 The Bitcoin Core developers
- * Copyright (c) 2014-2018 The Eccoin developers
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU 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 General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
+// This file is part of the Eccoin project
+// Copyright (c) 2009-2010 Satoshi Nakamoto
+// Copyright (c) 2009-2016 The Bitcoin Core developers
+// Copyright (c) 2014-2018 The Eccoin developers
+// Distributed under the MIT software license, see the accompanying
+// file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
 #include "arith_uint256.h"