Merge remote-tracking branch 'bitcoin/0.10'

configure.ac

@@ -3,7 +3,7 @@ AC_PREREQ([2.60])
 define(_CLIENT_VERSION_MAJOR, 0)
 define(_CLIENT_VERSION_MINOR, 10)
 define(_CLIENT_VERSION_REVISION, 7)
-define(_CLIENT_VERSION_BUILD, 0)
+define(_CLIENT_VERSION_BUILD, 1)
 define(_CLIENT_VERSION_IS_RELEASE, true)
 define(_COPYRIGHT_YEAR, 2015)
 AC_INIT([Viacoin Core],[_CLIENT_VERSION_MAJOR._CLIENT_VERSION_MINOR._CLIENT_VERSION_REVISION],[info@viacoin.org],[viacoin])

doc/Doxyfile

@@ -34,7 +34,7 @@ PROJECT_NAME           = Bitcoin
 # This could be handy for archiving the generated documentation or 
 # if some version control system is used.
 
-PROJECT_NUMBER         = 0.10.1
+PROJECT_NUMBER         = 0.10.2
 
 # Using the PROJECT_BRIEF tag one can provide an optional one line description 
 # for a project that appears at the top of each page and should give viewer 

doc/README.md

@@ -1,4 +1,4 @@
-Viacoin Core 0.10
+Viacoin Core 0.10.7.1
 =====================
 
 Setup

doc/README_windows.txt

@@ -1,4 +1,4 @@
-Bitcoin Core 0.10.1
+Bitcoin Core 0.10.2
 =====================
 
 Intro

doc/release-notes.md

@@ -1,8 +1,8 @@
-Viacoin Core version 0.10.7 is now available from:
+Viacoin Core version 0.10.7.1 is now available from:
 
   https://github.com/viacoin/viacoin/releases
 
-This is a new minor version release, bringing bug fixes and translation 
+This is a new minor version release, bringing minor bug fixes and translation 
 updates. It is recommended to upgrade to this version.
 
 Please report bugs using the issue tracker at github:
@@ -48,101 +48,44 @@ Notable changes
 
 This is a minor release and hence there are no notable changes.
 For the notable changes in 0.10, refer to the release notes for the
-0.10.7 release at https://github.com/viacoin/viacoin/blob/v0.10.7/doc/release-notes.md
+0.10.7.1 release at https://github.com/viacoin/viacoin/blob/v0.10.7.1/doc/release-notes.md
 
-0.10.7 Change log
-=================
+0.10.7.1 Change log
 
-Detailed release notes follow. This overview includes changes that affect external
-behavior, not code moves, refactors or string updates.
+This fixes a serious problem on Windows with data directories that have non-ASCII
+characters (https://github.com/bitcoin/bitcoin/issues/6078).
 
-RPC:
-- `7f502be` fix crash: createmultisig and addmultisigaddress
-- `eae305f` Fix missing lock in submitblock
-
-Block (database) and transaction handling:
-- `1d2cdd2` Fix InvalidateBlock to add chainActive.Tip to setBlockIndexCandidates
-- `c91c660` fix InvalidateBlock to repopulate setBlockIndexCandidates
-- `002c8a2` fix possible block db breakage during re-index
-- `a1f425b` Add (optional) consistency check for the block chain data structures
-- `1c62e84` Keep mempool consistent during block-reorgs
-- `57d1f46` Fix CheckBlockIndex for reindex
-- `bac6fca` Set nSequenceId when a block is fully linked
-
-P2P protocol and network code:
-- BIP66 softfork
-- `78f64ef` don't trickle for whitelisted nodes
-- `ca301bf` Reduce fingerprinting through timestamps in 'addr' messages.
-- `200f293` Ignore getaddr messages on Outbound connections.
-- `d5d8998` Limit message sizes before transfer
-- `aeb9279` Better fingerprinting protection for non-main-chain getdatas.
-- `cf0218f` Make addrman's bucket placement deterministic (countermeasure 1 against eclipse attacks, see http://cs-people.bu.edu/heilman/eclipse/)
-- `0c6f334` Always use a 50% chance to choose between tried and new entries (countermeasure 2 against eclipse attacks)
-- `214154e` Do not bias outgoing connections towards fresh addresses (countermeasure 2 against eclipse attacks)
-- `aa587d4` Scale up addrman (countermeasure 6 against eclipse attacks)
-- `139cd81` Cap nAttempts penalty at 8 and switch to pow instead of a division loop
-
-Validation:
-- `d148f62` Acquire CCheckQueue's lock to avoid race condition
-
-Build system:
-- `8752b5c` 0.10 fix for crashes on OSX 10.6
+For other platforms there are no notable changes.
 
-Wallet:
-- N/A
+For the notable changes in 0.10.7, refer to the release notes
+at https://github.com/viacoin/viacoin/blob/v0.10.7/doc/release-notes.md
 
-GUI:
-- `2c08406` some mac specifiy cleanup (memory handling, unnecessary code)
-- `81145a6` fix OSX dock icon window reopening
-- `786cf72` fix a issue where "command line options"-action overwrite "Preference"-action (on OSX)
+0.10.7.1 Change log
+
+Detailed release notes follow. This overview includes changes that affect external
+behavior, not code moves, refactors or string updates.
 
-Tests:
-- `1117378` add RPC test for InvalidateBlock
+Wallet:
+- `824c011` fix boost::get usage with boost 1.58
 
 Miscellaneous:
-- `c9e022b` Initialization: set Boost path locale in main thread
-- `23126a0` Sanitize command strings before logging them.
-- `98add71` Add new DNS seed.
-- `470c2f2` Change ECDSA signing string.
-- `323de27` Initialization: setup environment before starting QT tests
-- `7494e09` Initialization: setup environment before starting tests
-- `df45564` Initialization: set fallback locale as environment variable
+- `da65606` Avoid crash on start in TestBlockValidity with gen=1.
+- `424ae66` don't imbue boost::filesystem::path with locale "C" on windows (fixes #6078)
 
 Credits
 =======
 
 Thanks to everyone who directly contributed to this release:
 
-- Alex Morcos
 - Cory Fields
-- dexX7
-- fsb4000
-- Gavin Andresen
 - Gregory Maxwell
-- Ivan Pustogarov
 - Jonas Schnelli
-- Matt Corallo
-- mrbandrews
-- Pieter Wuille
-- Ruben de Vries
-- Suhas Daftuar
 - Wladimir J. van der Laan
-- reorder
-- btcdrak
 
 And all those who contributed additional code review and/or security research:
-- 21E14
-- Alison Kendler
-- Aviv Zohar
-- Ethan Heilman
-- Evil-Knievel
-- fanquake
-- Jeff Garzik
-- Jonas Nick
-- Luke Dashjr
-- Patrick Strateman
-- Philip Kaufmann
-- Sergio Demian Lerner
-- Sharon Goldberg
+
+- dexX7
+- Pieter Wuille
+- vayvanne
 
 As well as everyone that helped translating on [Transifex](https://www.transifex.com/projects/p/bitcoin/).

src/clientversion.h

@@ -17,7 +17,7 @@
 #define CLIENT_VERSION_MAJOR 0
 #define CLIENT_VERSION_MINOR 10
 #define CLIENT_VERSION_REVISION 7
-#define CLIENT_VERSION_BUILD 0
+#define CLIENT_VERSION_BUILD 1
 
 //! Set to true for release, false for prerelease or test build
 #define CLIENT_VERSION_IS_RELEASE true

src/miner.cpp

@@ -431,8 +431,16 @@ void static BitcoinMiner(CWallet *pwallet)
             if (Params().MiningRequiresPeers()) {
                 // Busy-wait for the network to come online so we don't waste time mining
                 // on an obsolete chain. In regtest mode we expect to fly solo.
-                while (vNodes.empty())
+                do {
+                    bool fvNodesEmpty;
+                    {
+                        LOCK(cs_vNodes);
+                        fvNodesEmpty = vNodes.empty();
+                    }
+                    if (!fvNodesEmpty && !IsInitialBlockDownload())
+                        break;
                     MilliSleep(1000);
+                } while (true);
             }
 
             //
@@ -544,6 +552,11 @@ void static BitcoinMiner(CWallet *pwallet)
         LogPrintf("ViacoinMiner terminated\n");
         throw;
     }
+    catch (const std::runtime_error &e)
+    {
+        LogPrintf("BitcoinMiner runtime error: %s\n", e.what());
+        return;
+    }
 }
 
 void GenerateBitcoins(bool fGenerate, CWallet* pwallet, int nThreads)

src/qt/locale/bitcoin_ach.ts

@@ -1,4 +1,4 @@
-<TS language="ach" version="2.0">
+<TS language="ach" version="2.1">
 <context>
     <name>AddressBookPage</name>
     </context>

src/qt/locale/bitcoin_af_ZA.ts

@@ -1,4 +1,4 @@
-<TS language="af_ZA" version="2.0">
+<TS language="af_ZA" version="2.1">
 <context>
     <name>AddressBookPage</name>
     <message>

src/qt/locale/bitcoin_ar.ts

@@ -1,4 +1,4 @@
-<TS language="ar" version="2.0">
+<TS language="ar" version="2.1">
 <context>
     <name>AddressBookPage</name>
     <message>