Release 4.4.1 (#57)

* Updated fixed seeds * Restored makekeypair RPC code * Updated checkpoints * Changed money supply * Changed version to 4.4.1 Co-authored-by: wqking <wqking@outlook.com>
VitaeTeam · May 1, 2020 · d9b8318 · d9b8318
1 parent 78293d4
commit d9b8318
Show file tree

Hide file tree

Showing 9 changed files with 54 additions and 11 deletions.
diff --git a/configure.ac b/configure.ac
@@ -2,8 +2,8 @@ dnl require autoconf 2.60 (AS_ECHO/AS_ECHO_N)
 AC_PREREQ([2.60])
 define(_CLIENT_VERSION_MAJOR, 4)
 define(_CLIENT_VERSION_MINOR, 4)
-define(_CLIENT_VERSION_REVISION, 0)
-define(_CLIENT_VERSION_BUILD, 3)
+define(_CLIENT_VERSION_REVISION, 1)
+define(_CLIENT_VERSION_BUILD, 0)
 define(_CLIENT_VERSION_IS_RELEASE, true)
 define(_COPYRIGHT_YEAR, 2019)
 AC_INIT([Vitae Core],[_CLIENT_VERSION_MAJOR._CLIENT_VERSION_MINOR._CLIENT_VERSION_REVISION],[www.vitaetoken.io],[vitae])

diff --git a/contrib/seeds/nodes_main.txt b/contrib/seeds/nodes_main.txt
@@ -0,0 +1,11 @@
+116.203.127.140:8765
+107.191.49.43:8765
+209.182.216.144:8765
+198.13.50.121:8765
+198.13.50.121:8765
+159.89.227.25:8765
+217.163.28.214:8765
+185.24.97.11:8765
+140.82.24.121:8765
+144.202.78.55:8765
+45.32.230.157:8765
diff --git a/contrib/seeds/nodes_test.txt b/contrib/seeds/nodes_test.txt
@@ -0,0 +1,2 @@
+95.179.139.31:8763
+45.76.229.115:8763
diff --git a/src/chainparams.cpp b/src/chainparams.cpp
@@ -57,11 +57,17 @@ static Checkpoints::MapCheckpoints mapCheckpoints =
     (191884,uint256("45b95a52b673fd9f620bed8d59c5cfb05db0ffc33225bc6778b08d251348b185"))
     (204305,uint256("101cfe17653d7b5ea6bb15531d9344dd65837f96904599ebc054bc8f6fad355d")) //about when spork 15 activated
     (204464,uint256("9d2f9808c10408899cfff44f6a3adc44690912dd0dcb3b530c45cd2ad9a31f0e")) //about when spork 16 activated
-    (369647,uint256("82ba21a1afcb59ebdede612516d9c3bfed42e2e18baba172b971fd714d32bdf6"));
+    (369647,uint256("82ba21a1afcb59ebdede612516d9c3bfed42e2e18baba172b971fd714d32bdf6"))
+    (600000,uint256("c6c87c5f70578ebb270012492e0dd222d6532a864853beefc894840aad73f021"))    
+    (700000,uint256("5a857ad8a1f2922273ea8691491332f805af19e9c2e3b8eba57d473e93f67fb7"))    
+    (800000,uint256("ef48831e1547b45d90ef5360c606f49e35504f38abe383614486753cb9451515"))    
+    (900000,uint256("23614a26ae6b3e457eec08dde3ad04ff15b0ca4e0ec3e8acf0c4c153beb997eb"))    
+    (1000000,uint256("3a121397bca5552e637c80f981db080c54e1bae2def44fc06071cb4867df7124"))    
+    (1356300,uint256("b6a142e71ced86ca8ce28991cf2a1a84944f68baaf786d8cd17b24cd27a69cb0"));
 static const Checkpoints::CCheckpointData data = {
     &mapCheckpoints,
-    1543517521, // * UNIX timestamp of last checkpoint block
-    781425,     // * total number of transactions between genesis and last checkpoint
+    1588196373, // * UNIX timestamp of last checkpoint block
+    3883710,     // * total number of transactions between genesis and last checkpoint
                 //   (the tx=... number in the SetBestChain debug.log lines)
     2000        // * estimated number of transactions per day after checkpoint
 };

diff --git a/src/chainparamsseeds.h b/src/chainparamsseeds.h
@@ -8,9 +8,11 @@
  * IPv4 as well as onion addresses are wrapped inside a IPv6 address accordingly.
  */
 static SeedSpec6 pnSeed6_main[] = {
+    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x74,0xcb,0x7f,0x8c}, 8765},
+    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x6b,0xbf,0x31,0x2b}, 8765},
     {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xd1,0xb6,0xd8,0x90}, 8765},
     {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xc6,0x0d,0x32,0x79}, 8765},
-    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x68,0xee,0xb7,0x4b}, 8765},
+    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xc6,0x0d,0x32,0x79}, 8765},
     {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x9f,0x59,0xe3,0x19}, 8765},
     {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xd9,0xa3,0x1c,0xd6}, 8765},
     {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xb9,0x18,0x61,0x0b}, 8765},
@@ -20,9 +22,7 @@ static SeedSpec6 pnSeed6_main[] = {
 };
 
 static SeedSpec6 pnSeed6_test[] = {
-    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xd1,0xb6,0xd8,0x90}, 8763},
-    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xd1,0xb6,0xd8,0xbb}, 8763},
-    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xc6,0x0d,0x32,0x79}, 8763},
-    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x68,0xee,0xb7,0x4b}, 8763}
+    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x5f,0xb3,0x8b,0x1f}, 8763},
+    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x2d,0x4c,0xe5,0x73}, 8763}
 };
 #endif // BITCOIN_CHAINPARAMSSEEDS_H
diff --git a/src/main.cpp b/src/main.cpp
@@ -3329,7 +3329,7 @@ bool RecalculateVITSupply(int nHeightStart)
     CBlockIndex* pindex = chainActive[nHeightStart];
     CAmount nSupplyPrev = pindex->pprev->nMoneySupply;
     if (nHeightStart == Params().Zerocoin_StartHeight())
-        nSupplyPrev = CAmount(5449796547496199);
+        nSupplyPrev = CAmount(649916627717750);
 
     while (true) {
         if (pindex->nHeight % 1000 == 0)

diff --git a/src/rpcserver.cpp b/src/rpcserver.cpp
@@ -358,6 +358,7 @@ static const CRPCCommand vRPCCommands[] =
         {"vitae", "fnsync", &fnsync, true, true, false},
         {"vitae", "spork", &spork, true, true, false},
         {"vitae", "getpoolinfo", &getpoolinfo, true, true, false},
+        {"vitae", "makekeypair", &makekeypair, true, true, false},
         {"vitae", "mnspork", &mnspork, true, true, false},
         {"vitae", "masternode", &masternode, true, true, false},
         {"vitae", "masternodelist", &masternodelist, true, true, false},

diff --git a/src/rpcserver.h b/src/rpcserver.h
@@ -233,6 +233,7 @@ extern UniValue importzerocoins(const UniValue& params, bool fHelp);
 extern UniValue exportzerocoins(const UniValue& params, bool fHelp);
 extern UniValue reconsiderzerocoins(const UniValue& params, bool fHelp);
 extern UniValue getspentzerocoinamount(const UniValue& params, bool fHelp);
+extern UniValue makekeypair(const UniValue& params, bool fHelp);
 
 extern UniValue getrawtransaction(const UniValue& params, bool fHelp); // in rcprawtransaction.cpp
 extern UniValue listunspent(const UniValue& params, bool fHelp);

diff --git a/src/rpcwallet.cpp b/src/rpcwallet.cpp
@@ -2840,3 +2840,25 @@ UniValue reconsiderzerocoins(const UniValue& params, bool fHelp)
 
     return arrRet;
 }
+
+// ppcoin: make a public-private key pair
+UniValue makekeypair(const UniValue& params, bool fHelp)
+{
+    if (fHelp || params.size() > 1)
+        throw runtime_error(
+            "makekeypair [prefix]\n"
+            "Make a public/private key pair.\n"
+            "[prefix] is optional preferred prefix for the public key.\n");
+
+    string strPrefix = "";
+    if (params.size() > 0)
+        strPrefix = params[0].get_str();
+
+    CKey key;
+    key.MakeNewKey(false);
+
+    UniValue result(UniValue::VOBJ);
+    result.push_back(Pair("PrivateKey", CBitcoinSecret(key).ToString()));
+    result.push_back(Pair("PublicKey", HexStr(key.GetPubKey().Raw())));
+    return result;
+}