Bump version v5.1.0. move smartcontract fork block back to block 350k

Signed-off-by: k155 <216k155@luxcore.io>
(cherry picked from commit 189916a)
Signed-off-by: k155 <216k155@luxcore.io>

configure.ac

@@ -1,8 +1,8 @@
 dnl require autoconf 2.60 (AS_ECHO/AS_ECHO_N)
 AC_PREREQ([2.60])
 define(_CLIENT_VERSION_MAJOR, 5)
-define(_CLIENT_VERSION_MINOR, 0)
-define(_CLIENT_VERSION_REVISION, 3)
+define(_CLIENT_VERSION_MINOR, 1)
+define(_CLIENT_VERSION_REVISION, 0)
 define(_CLIENT_VERSION_BUILD, 0)
 define(_CLIENT_VERSION_IS_RELEASE, true)
 define(_COPYRIGHT_YEAR, 2018)

src/chainparams.cpp

@@ -164,7 +164,7 @@ class CMainParams : public CChainParams
         consensus.vDeployments[Consensus::SMART_CONTRACTS_HARDFORK].bit = 30;
 
         nSwitchPhi2Block = 299501;
-        nFirstSCBlock = 400000;
+        nFirstSCBlock = 350000;
         nPruneAfterHeight = 300000;
         nSplitRewardBlock = 300000;
 

src/clientversion.h

@@ -15,8 +15,8 @@
 
 //! These need to be macros, as clientversion.cpp's and lux*-res.rc's voodoo requires it
 #define CLIENT_VERSION_MAJOR 5
-#define CLIENT_VERSION_MINOR 0
-#define CLIENT_VERSION_REVISION 3
+#define CLIENT_VERSION_MINOR 1
+#define CLIENT_VERSION_REVISION 0
 #define CLIENT_VERSION_BUILD 0
 
 //! Set to true for release, false for prerelease or test build

src/darksend.h

@@ -223,7 +223,7 @@ class CDarksendSession
 class CDarkSendPool
 {
 public:
-    static const int MIN_PEER_PROTO_VERSION = 69100;
+    static const int MIN_PEER_PROTO_VERSION = 69500;
 
     // clients entries
     std::vector<CDarkSendEntry> myEntries;

src/key.cpp

@@ -136,6 +136,15 @@ void CKey::MakeNewKey(bool fCompressedIn) {
     fCompressed = fCompressedIn;
 }
 
+bool CKey::SetPrivKey(const CPrivKey& privkey, bool fCompressedIn)
+{
+    if (!ec_privkey_import_der(secp256k1_context_sign, (unsigned char*)begin(), &privkey[0], privkey.size()))
+        return false;
+    fCompressed = fCompressedIn;
+    fValid = true;
+    return true;
+}
+
 uint256 CKey::GetPrivKey_256() {
     void* key = keydata.data();
     uint256* key_256 = (uint256*)key;

src/key.h

@@ -106,6 +106,9 @@ class CKey
     //! Check whether the public key corresponding to this private key is (to be) compressed.
     bool IsCompressed() const { return fCompressed; }
 
+    //! Initialize from a CPrivKey (serialized OpenSSL private key data).
+    bool SetPrivKey(const CPrivKey& vchPrivKey, bool fCompressed);
+
     //! Generate a new private key using a cryptographic PRNG.
     void MakeNewKey(bool fCompressed);