Merge branch 'master' of https://github.com/B3-Coin/B3-CoinV2

#bump version
B3-Coin · Dec 16, 2017 · 4e92dbb · 4e92dbb
2 parents 58580d1 + 74acd00
commit 4e92dbb
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 7 deletions.
diff --git a/B3-Coin.pro b/B3-Coin.pro
@@ -13,7 +13,7 @@
 
 TEMPLATE = app
 TARGET = b3coin-qt
-VERSION = 3.0.0.4
+VERSION = 3.1.1.1
 INCLUDEPATH += src src/json src/qt
 QT += network 
 DEFINES += ENABLE_WALLET

diff --git a/src/clientversion.h b/src/clientversion.h
@@ -7,9 +7,9 @@
 
 // These need to be macros, as version.cpp's and bitcoin-qt.rc's voodoo requires it
 #define CLIENT_VERSION_MAJOR       3
-#define CLIENT_VERSION_MINOR       0
-#define CLIENT_VERSION_REVISION    0
-#define CLIENT_VERSION_BUILD       5
+#define CLIENT_VERSION_MINOR       1
+#define CLIENT_VERSION_REVISION    1
+#define CLIENT_VERSION_BUILD       1
 
 // Set to true for release, false for prerelease or test build
 #define CLIENT_VERSION_IS_RELEASE  false

diff --git a/src/version.h b/src/version.h
@@ -30,13 +30,13 @@ static const int DATABASE_VERSION = 70510;
 // network protocol versioning
 //
 
-static const int PROTOCOL_VERSION = 80006;
+static const int PROTOCOL_VERSION = 80007;
 
 // intial proto version, to be increased after version/verack negotiation
 static const int INIT_PROTO_VERSION = 209;
 
 // disconnect from peers older than this proto version
-static const int MIN_PEER_PROTO_VERSION = 80005;
+static const int MIN_PEER_PROTO_VERSION = 80006;
 
 // nTime field added to CAddress, starting with this version;
 // if possible, avoid requesting addresses nodes older than this

diff --git a/src/wallet.cpp b/src/wallet.cpp
@@ -1141,7 +1141,7 @@ void CWallet::AvailableCoins(vector<COutput>& vCoins, bool fOnlyConfirmed, const
             } else{
 
                 for (unsigned int i = 0; i < pcoin->vout.size(); i++)
-                    if (!(pcoin->IsSpent(i)) && IsMine(pcoin->vout[i]) && pcoin->vout[i].nValue >= nMinimumInputValue &&
+                    if (!(pcoin->IsSpent(i)) && IsMine(pcoin->vout[i]) && pcoin->vout[i].nValue > 1*COIN &&
                     (!coinControl || !coinControl->HasSelected() || coinControl->IsSelected((*it).first, i)))
                         vCoins.push_back(COutput(pcoin, i, nDepth));
             }