Merge pull request #65 from metalicjames/v0.10.0.2

v0.10.0.2
vertcoin · Dec 21, 2016 · a16c62f · a16c62f
2 parents 89b36b9 + 121c3de
commit a16c62f
Show file tree

Hide file tree

Showing 22 changed files with 100 additions and 193 deletions.
diff --git a/README.md b/README.md
@@ -3,9 +3,9 @@ Vertcoin integration/staging tree
 
 http://www.vertcoin.org
 
-Copyright (c) 2009-2013 Bitcoin Developers
-Copyright (c) 2011-2013 Litecoin Developers
-Copyright (c) 2014-2015 Vertcoin Developers
+Copyright 2009-2013 Bitcoin Developers
+Copyright 2011-2013 Litecoin Developers
+Copyright 2014-2016 Vertcoin Developers
 
 What is Vertcoin?
 ----------------

diff --git a/doc/build-unix.md b/doc/build-unix.md
@@ -1,10 +1,3 @@
-Copyright (c) 2009-2013 Bitcoin Developers (c) 2014-2015 Vertcoin Developers
-
-Distributed under the MIT/X11 software license, see the accompanying
-file COPYING or http://www.opensource.org/licenses/mit-license.php.
-This product includes software developed by the OpenSSL Project for use in the [OpenSSL Toolkit](http://www.openssl.org/). This product includes
-cryptographic software written by Eric Young ([[email protected]](mailto:[email protected])), and UPnP software written by Thomas Bernard.
-
 UNIX BUILD NOTES
 ====================
 
@@ -18,14 +11,14 @@ See readme-qt.rst for instructions on building vertcoin-qt, the graphical user i
 
 Dependencies
 ---------------------
-
+
  Library       |Purpose           |Description						    				
  --------------|------------------|---------------------------------------------------------
  libssl        |SSL Support       |Secure communications
- libdb4.8      |Berkeley DB       |Blockchain & wallet storage	
+ libdb         |Berkeley DB       |Blockchain & wallet storage	
  libboost      |Boost             |C++ Library
  miniupnpc     |UPnP Support      |Optional firewall-jumping support
- libsecp256k1EC|EC Operations	   |Optimized C library for EC operations on curve secp256k1.
+ libsecp256k1EC|EC Operations	  |Optimized C library for EC operations on curve secp256k1.
 
 [miniupnpc](http://miniupnp.free.fr/) may be used for UPnP port mapping.  It can be downloaded from [here](
 http://miniupnp.tuxfamily.org/files/).  UPnP support is compiled in and
@@ -48,107 +41,29 @@ Licenses of statically linked libraries:
  miniupnpc     |New (3-clause) BSD license
  libsecp256k1  |MIT License
 
-- Versions used in this release:
--  GCC           4.3.3
--  OpenSSL       1.0.1c
--  Berkeley DB   4.8.30.NC
--  Boost         1.37
--  miniupnpc     1.6
-
 Dependency Build Instructions: Ubuntu & Debian
 ----------------------------------------------
 Build requirements:
 
-    sudo apt-get install build-essential git autoconf libtool
-    sudo apt-get install libssl-dev
-
-for Ubuntu 12.04:
-
-    sudo apt-get install libboost-all-dev
-
- db4.8 packages are available [here](https://launchpad.net/~bitcoin/+archive/bitcoin).
-
- Ubuntu precise has packages for libdb5.1-dev and libdb5.1++-dev,
- but using these will break binary wallet compatibility, and is not recommended.
-
-for other Ubuntu & Debian:
-
-    sudo apt-get install libdb4.8-dev
-    sudo apt-get install libdb4.8++-dev
-    sudo apt-get install libboost1.37-dev
- (If using Boost 1.37, append -mt to the boost libraries in the makefile)
+    sudo apt-get install build-essential git autoconf libtool libssl-dev libboost-all-dev libdb++-dev libgmp-dev
 
 libsecp256k1:
 
-    sudo apt-get install libgmp-dev
     cd src/secp256k1
     ./autogen.sh
     ./configure
     make
-    make install
+    sudo make install
 
 Optional:
 
     sudo apt-get install libminiupnpc-dev (see USE_UPNP compile flag)
 
-
-Dependency Build Instructions: FreeBSD 8.x/9.x
-----------------------------------------------
-Build and install dependencies manually via ports:
-
-    cd /usr/ports/net/miniupnpc && make install clean
-    cd /usr/ports/devel/gmake && make install clean
-    cd /usr/ports/databases/db48 && make install clean
-    cd /usr/ports/devel/boost-libs && make install clean
-
-Or using portmaster:
-
-    portmaster -d net/miniupnpc devel/gmake databases/db48 devel/boost-libs
-
-
-Enable miniupnpc system startup by modifying /etc/rc.conf and adding the following:
-
-    miniupnpc_enable="YES"
-
-
-To compile Vertcoin with GNU make:
-
-    cd src/
-    gmake -f makefile.fbsd
-
-
 Notes
 -----
 The release is built with GCC and then "strip vertcoind" to strip the debug
 symbols, which reduces the executable size by about 90%.
 
-
-miniupnpc
----------
-    tar -xzvf miniupnpc-1.6.tar.gz
-    cd miniupnpc-1.6
-    make
-    sudo su
-    make install
-
-
-Berkeley DB
------------
-You need Berkeley DB 4.8.  If you have to build Berkeley DB yourself:
-
-    ../dist/configure --enable-cxx
-    make
-
-
-Boost
------
-If you need to build Boost yourself:
-
-    sudo su
-    ./bootstrap.sh
-    ./bjam install
-
-
 Security
 --------
 To help make your vertcoin installation more secure by making certain attacks impossible to

diff --git a/doc/readme-qt.rst b/doc/readme-qt.rst
@@ -1,44 +1,31 @@
 Vertcoin-Qt: Qt4 GUI for Vertcoin
-===============================
+=================================
 
 Build instructions
 ===================
 
-Debian
+Ubuntu/Debian
 -------
 
-First, make sure that the required packages for Qt4 development of your
-distribution are installed, these are
-
-::
-
-for Debian and Ubuntu  <= 11.10 :
+First, build the command line wallet. This will help you install all of the
+required dependencies before attempting to build the GUI wallet.
 
-::
-
-    apt-get install qt4-qmake libqt4-dev build-essential libboost-dev libboost-system-dev \
-        libboost-filesystem-dev libboost-program-options-dev libboost-thread-dev \
-        libssl-dev libdb4.8++-dev libminiupnpc-dev
-
-for Ubuntu >= 12.04 (please read the 'Berkely DB version warning' below):
+Second, make sure that the required packages for Qt4 development of your
+distribution are installed, these are
 
 ::
 
-    apt-get install qt4-qmake libqt4-dev build-essential libboost-dev libboost-system-dev \
-        libboost-filesystem-dev libboost-program-options-dev libboost-thread-dev \
-        libssl-dev libdb++-dev libminiupnpc-dev
-
-For Qt 5 you need the following, otherwise you get an error with lrelease when running qmake:
+for Ubuntu >= 14.04 (please read the 'Berkely DB version warning' below):
 
 ::
 
-    apt-get install qt5-qmake libqt5gui5 libqt5core5 libqt5dbus5 qttools5-dev-tools
+    sudo apt-get install qt4-qmake libqt4-dev libqrencode-dev
 
-then execute the following:
+Then execute the following:
 
 ::
 
-    qmake
+    qmake vertcoin-qt.pro
     make
 
 Alternatively, install `Qt Creator`_ and open the `vertcoin-qt.pro` file.
@@ -135,9 +122,8 @@ Berkely DB version warning
 
 A warning for people using the *static binary* version of Vertcoin on a Linux/UNIX-ish system (tl;dr: **Berkely DB databases are not forward compatible**).
 
-The static binary version of Vertcoin is linked against libdb4.8 (see also `this Debian issue`_).
-
-Now the nasty thing is that databases from 5.X are not compatible with 4.X.
+The current static binary version of Vertcoin is linked against libdb5.2 (see also `this Debian issue`_). Previous versions were compiled
+with libdb4.8 but the nasty thing is that databases from 5.X are not compatible with 4.X.
 
 If the globally installed development package of Berkely DB installed on your system is 5.X, any source you
 build yourself will be linked against that. The first time you run with a 5.X version the database will be upgraded,
@@ -146,18 +132,3 @@ significant hassle!
 
 .. _`this Debian issue`: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=621425
 
-Ubuntu 11.10 warning
-====================
-
-Ubuntu 11.10 has a package called 'qt-at-spi' installed by default.  At the time of writing, having that package
-installed causes vertcoin-qt to crash intermittently.  The issue has been reported as `launchpad bug 857790`_, but
-isn't yet fixed.
-
-Until the bug is fixed, you can remove the qt-at-spi package to work around the problem, though this will presumably
-disable screen reader functionality for Qt apps:
-
-::
-
-    sudo apt-get remove qt-at-spi
-
-.. _`launchpad bug 857790`: https://bugs.launchpad.net/ubuntu/+source/qt-at-spi/+bug/857790
diff --git a/doc/release-notes.md b/doc/release-notes.md
@@ -1,6 +1,49 @@
 0.10.0.2 changes
 =============
 - Added new Lyra2REv2 testnet
+- Update nodes list
+- Update block explorer URL
+- Fix build warnings
+- Added a checkpoint
+
+0.10.0.1 changes
+=============
+- Update node lists and checkpoints
+
+0.10.0.0 changes
+=============
+- Fork to Lyra2REv2 at block 347000 (mainnet) and 127000 (testnet)
+- Fix solomining to the wallet using getwork
+- Fix a transaction fee bug
+
+0.9.0.2 changes
+=============
+- Fix segmentation fault on -reindex flag
+- Fix segmentation fault on -disablewallet=1 flag
+- Fix all current build warnings
+- Update "make clean" to remove Lyra2RE files
+- Update block explorer links
+- Update seed nodes
+- New checkpoint
+- Add support for "watch only" addresses
+- Removed some debugging output that is not relevant after the successful fork
+- Update for OpenSSL 1.0.1k
+
+0.9.0.1 changes
+=============
+- Fixes testnet
+
+0.9.0.0 changes
+=============
+- Fork to Lyra2RE
+
+0.8.7.3 changes
+=============
+- Supporting Stealth Address Transactions
+- Supporting OP_RETURN
+- Adding GUI for Stealth Address
+- Fixed wrong description
+- Fixed transaction fees
 
 0.8.7.2 changes
 =============

diff --git a/share/genbuild.sh b/share/genbuild.sh
@@ -17,7 +17,7 @@ if [ -e "$(which git)" ]; then
 
     # get a string like "v0.6.0-66-g59887e8-dirty"
     # DESC="$(git describe --dirty 2>/dev/null)"
-    DESC="$(git describe --abbrev=0 2>/dev/null)"
+    DESC="$(git describe --abbrev=0 --tags 2>/dev/null)"
 
     # get a string like "2012-04-10 16:27:19 +0200"
     TIME="$(date '+%F %T %z')"

diff --git a/share/setup.nsi b/share/setup.nsi
@@ -5,7 +5,7 @@ SetCompressor /SOLID lzma
 
 # General Symbol Definitions
 !define REGKEY "SOFTWARE\$(^Name)"
-!define VERSION 0.10.0.1
+!define VERSION 0.10.0.2
 !define COMPANY "Vertcoin project"
 !define URL https://www.vertcoin.org/
 

diff --git a/src/checkpoints.cpp b/src/checkpoints.cpp
@@ -39,18 +39,19 @@ namespace Checkpoints
         (  24200, uint256("0xd7ed819858011474c8b0cae4ad0b9bdbb745becc4c386bc22d1220cc5a4d1787"))
         (  65000, uint256("0x9e673a69c35a423f736ab66f9a195d7c42f979847a729c0f3cef2c0b8b9d0289"))
         (  84065, uint256("0xa904170a5a98109b2909379d9bc03ef97a6b44d5dafbc9084b8699b0cba5aa98"))
-		(  228023, uint256("0x15c94667a9e941359d2ee6527e2876db1b5e7510a5ded3885ca02e7e0f516b51"))
+	(  228023, uint256("0x15c94667a9e941359d2ee6527e2876db1b5e7510a5ded3885ca02e7e0f516b51"))
         (  346992, uint256("0xf1714fa4c7990f4b3d472eb22132891ccd3c7ad7208e2d1ab15bde68854fb0ee"))
         (  347269, uint256("0xfa1e592b7ea2aa97c5f20ccd7c40f3aaaeb31d1232c978847a79f28f83b6c22a"))
         (  430000, uint256("0x2f5703cf7b6f956b84fd49948cbf49dc164cfcb5a7b55903b1c4f53bc7851611"))
         (  516999, uint256("0x572ed47da461743bcae526542053e7bc532de299345e4f51d77786f2870b7b28"))
-        ;
+        (  627610, uint256("0x6000a787f2d8bb77d4f491a423241a4cc8439d862ca6cec6851aba4c79ccfedc"))
+	;
     static const CCheckpointData data = {
         &mapCheckpoints,
-        1464732960, // * UNIX timestamp of last checkpoint block
-        1937632,    // * total number of transactions between genesis and last checkpoint
+        1481263875, // * UNIX timestamp of last checkpoint block
+        2134630,    // * total number of transactions between genesis and last checkpoint
                     //   (the tx=... number in the SetBestChain debug.log lines)
-        1200.0     // * estimated number of transactions per day after checkpoint
+        450.0     // * estimated number of transactions per day after checkpoint
     };
 
     static MapCheckpoints mapCheckpointsTestnet =

diff --git a/src/clientversion.h b/src/clientversion.h
@@ -9,7 +9,7 @@
 #define CLIENT_VERSION_MAJOR       0
 #define CLIENT_VERSION_MINOR       10
 #define CLIENT_VERSION_REVISION    0
-#define CLIENT_VERSION_BUILD       1
+#define CLIENT_VERSION_BUILD       2
 
 // Set to true for release, false for prerelease or test build
 #define CLIENT_VERSION_IS_RELEASE  true

diff --git a/src/leveldb/db/memtable.cc b/src/leveldb/db/memtable.cc
@@ -101,7 +101,7 @@ void MemTable::Add(SequenceNumber s, ValueType type,
   p += 8;
   p = EncodeVarint32(p, val_size);
   memcpy(p, value.data(), val_size);
-  assert((p + val_size) - buf == encoded_len);
+  assert((p + val_size) - buf == static_cast<int>(encoded_len));
   table_.Insert(buf);
 }
 

diff --git a/src/leveldb/db/version_set.cc b/src/leveldb/db/version_set.cc
@@ -54,20 +54,6 @@ static int64_t TotalFileSize(const std::vector<FileMetaData*>& files) {
   return sum;
 }
 
-namespace {
-std::string IntSetToString(const std::set<uint64_t>& s) {
-  std::string result = "{";
-  for (std::set<uint64_t>::const_iterator it = s.begin();
-       it != s.end();
-       ++it) {
-    result += (result.size() > 1) ? "," : "";
-    result += NumberToString(*it);
-  }
-  result += "}";
-  return result;
-}
-}  // namespace
-
 Version::~Version() {
   assert(refs_ == 0);
 

diff --git a/src/leveldb/util/bloom.cc b/src/leveldb/util/bloom.cc
@@ -47,7 +47,7 @@ class BloomFilterPolicy : public FilterPolicy {
     dst->resize(init_size + bytes, 0);
     dst->push_back(static_cast<char>(k_));  // Remember # of probes in filter
     char* array = &(*dst)[init_size];
-    for (size_t i = 0; i < n; i++) {
+    for (size_t i = 0; static_cast<int>(i) < n; i++) {
       // Use double-hashing to generate a sequence of hash values.
       // See analysis in [Kirsch,Mitzenmacher 2006].
       uint32_t h = BloomHash(keys[i]);

diff --git a/src/leveldb/util/logging.cc b/src/leveldb/util/logging.cc
@@ -64,7 +64,7 @@ bool ConsumeDecimalNumber(Slice* in, uint64_t* val) {
       const int delta = (c - '0');
       static const uint64_t kMaxUint64 = ~static_cast<uint64_t>(0);
       if (v > kMaxUint64/10 ||
-          (v == kMaxUint64/10 && delta > kMaxUint64%10)) {
+          (v == kMaxUint64/10 && delta > static_cast<int>(kMaxUint64%10))) {
         // Overflow
         return false;
       }

diff --git a/src/main.cpp b/src/main.cpp
@@ -4881,7 +4881,7 @@ void static VertcoinMiner(CWallet *pwallet)
         unsigned int nTransactionsUpdatedLast = nTransactionsUpdated;
         CBlockIndex* pindexPrev = pindexBest;
 
-        auto_ptr<CBlockTemplate> pblocktemplate(CreateNewBlockWithKey(reservekey));
+        unique_ptr<CBlockTemplate> pblocktemplate(CreateNewBlockWithKey(reservekey));
         if (!pblocktemplate.get())
             return;
         CBlock *pblock = &pblocktemplate->block;