From 827ae1d0acd253ee9f6862bfa408e864c3d3b827 Mon Sep 17 00:00:00 2001 From: StealthSend Date: Wed, 9 Aug 2017 02:03:56 -0600 Subject: [PATCH 1/2] fixing protocol version comment --- src/version.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/version.h b/src/version.h index 98f64f9..9ad092f 100644 --- a/src/version.h +++ b/src/version.h @@ -31,7 +31,7 @@ extern const std::string CLIENT_DATE; // 62010 : New rule to accept duplicate stake on bootstrap (only!) // Technically not a network protocol difference // 62020 : Fixes signature malleability -// 62200 : Clockdrift improvements & Checklocktimeverify (forking) +// 62100 : Clockdrift improvements & Checklocktimeverify (forking) static const int PROTOCOL_VERSION = 62100; // intial proto version, to be increased after version/verack negotiation From a374f2ac1f798d5c60a887b833e55f48325660e1 Mon Sep 17 00:00:00 2001 From: StealthSend Date: Wed, 9 Aug 2017 15:35:23 -0600 Subject: [PATCH 2/2] Fixing SignSignature bug that prevents stake signing --- Stealth.pro | 2 +- contrib/macdeploy/Info.plist | 6 +++--- src/clientversion.h | 2 +- src/version.h | 3 ++- src/wallet.cpp | 8 ++++++-- 5 files changed, 13 insertions(+), 8 deletions(-) diff --git a/Stealth.pro b/Stealth.pro index b0ae3aa..17836be 100644 --- a/Stealth.pro +++ b/Stealth.pro @@ -18,7 +18,7 @@ win32 { TEMPLATE = app TARGET = "Stealth Qt" -VERSION = 2.1.0.0 +VERSION = 2.1.0.1 INCLUDEPATH += src src/json src/qt src/tor INCLUDEPATH += src/tor/adapter src/tor/common src/tor/ext INCLUDEPATH += src/tor/ext/curve25519_donna src/tor/ext/ed25519/donna diff --git a/contrib/macdeploy/Info.plist b/contrib/macdeploy/Info.plist index 4590734..7caa569 100644 --- a/contrib/macdeploy/Info.plist +++ b/contrib/macdeploy/Info.plist @@ -9,16 +9,16 @@ CFBundlePackageType APPL CFBundleGetInfoString - StealthCoin [XST] Complete Anonymity 2.1.0.0 + StealthCoin [XST] Complete Anonymity 2.1.0.1 CFBundleExecutable Stealth Qt CFBundleIdentifier com.stealth-coin.stealthcoin-qt CFBundleShortVersionString - 2.1.0.0 + 2.1.0.1 CFBundleSignature oXST CFBundleVersion - 2.1.0.0 + 2.1.0.1 diff --git a/src/clientversion.h b/src/clientversion.h index 1a1ef8b..8b87536 100644 --- a/src/clientversion.h +++ b/src/clientversion.h @@ -9,7 +9,7 @@ #define CLIENT_VERSION_MAJOR 2 #define CLIENT_VERSION_MINOR 1 #define CLIENT_VERSION_REVISION 0 -#define CLIENT_VERSION_BUILD 0 +#define CLIENT_VERSION_BUILD 1 // Converts the parameter X to a string after macro replacement on X has been performed. // Don't merge these into one macro! diff --git a/src/version.h b/src/version.h index 9ad092f..318fc70 100644 --- a/src/version.h +++ b/src/version.h @@ -32,6 +32,7 @@ extern const std::string CLIENT_DATE; // Technically not a network protocol difference // 62020 : Fixes signature malleability // 62100 : Clockdrift improvements & Checklocktimeverify (forking) +// Client version: 2.1.0 static const int PROTOCOL_VERSION = 62100; // intial proto version, to be increased after version/verack negotiation @@ -64,6 +65,6 @@ static const int DATABASE_VERSION = 61201; #define DISPLAY_VERSION_MAJOR 2 #define DISPLAY_VERSION_MINOR 1 #define DISPLAY_VERSION_REVISION 0 -#define DISPLAY_VERSION_BUILD 0 +#define DISPLAY_VERSION_BUILD 1 #endif diff --git a/src/wallet.cpp b/src/wallet.cpp index 6f68814..e5257a5 100644 --- a/src/wallet.cpp +++ b/src/wallet.cpp @@ -1518,8 +1518,10 @@ bool CWallet::CreateTransaction(const vector >& vecSend, CW int nIn = 0; BOOST_FOREACH(const PAIRTYPE(const CWalletTx*,unsigned int)& coin, setCoins) - if (!SignSignature(*this, *coin.first, wtxNew, nIn++)) + if (SignSignature(*this, *coin.first, wtxNew, nIn++) != 0) + { return false; + } unsigned int nBytes = ::GetSerializeSize(*(CTransaction*)&wtxNew, SER_NETWORK, PROTOCOL_VERSION); if (nBytes >= MAX_BLOCK_SIZE_GEN/5) @@ -2525,8 +2527,10 @@ bool CWallet::CreateCoinStake(const CKeyStore& keystore, unsigned int nBits, int int nIn = 0; BOOST_FOREACH(const CWalletTx* pcoin, vwtxPrev) { - if (!SignSignature(*this, *pcoin, txNew, nIn++)) + if (SignSignature(*this, *pcoin, txNew, nIn++) != 0) + { return error("CreateCoinStake : failed to sign coinstake"); + } } // Limit size