Merge pull request bitcoin#8 from qtumproject/neil/QTUMCORE-2

Neil/qtumcore 2
classesjack · Mar 27, 2017 · b805940 · b805940
2 parents 73520f4 + 69e81c0
commit b805940
Show file tree

Hide file tree

Showing 13 changed files with 216 additions and 1,393 deletions.
diff --git a/.gitignore b/.gitignore
@@ -116,3 +116,8 @@ contrib/devtools/split-debug.sh
 .cproject
 .project
 .settings/language.settings.xml
+
+#clion project files
+.idea/
+CMakeLists.txt
+cmake-build-debug/
diff --git a/src/chainparams.cpp b/src/chainparams.cpp
diff --git a/src/chainparamsbase.cpp b/src/chainparamsbase.cpp
@@ -32,7 +32,7 @@ class CBaseMainParams : public CBaseChainParams
 public:
     CBaseMainParams()
     {
-        nRPCPort = 8332;
+        nRPCPort = 3889;
     }
 };
 static CBaseMainParams mainParams;
@@ -45,7 +45,7 @@ class CBaseTestNetParams : public CBaseChainParams
 public:
     CBaseTestNetParams()
     {
-        nRPCPort = 18332;
+        nRPCPort = 13889;
         strDataDir = "testnet3";
     }
 };
@@ -59,7 +59,7 @@ class CBaseRegTestParams : public CBaseChainParams
 public:
     CBaseRegTestParams()
     {
-        nRPCPort = 18332;
+        nRPCPort = 13889;
         strDataDir = "regtest";
     }
 };

diff --git a/src/chainparamsseeds.h b/src/chainparamsseeds.h
diff --git a/src/consensus/consensus.h b/src/consensus/consensus.h
@@ -9,15 +9,15 @@
 #include <stdint.h>
 
 /** The maximum allowed size for a serialized block, in bytes (only for buffer size limits) */
-static const unsigned int MAX_BLOCK_SERIALIZED_SIZE = 4000000;
+static const unsigned int MAX_BLOCK_SERIALIZED_SIZE = 8000000;
 /** The maximum allowed weight for a block, see BIP 141 (network rule) */
-static const unsigned int MAX_BLOCK_WEIGHT = 4000000;
+static const unsigned int MAX_BLOCK_WEIGHT = 8000000;
 /** The maximum allowed size for a block excluding witness data, in bytes (network rule) */
-static const unsigned int MAX_BLOCK_BASE_SIZE = 1000000;
+static const unsigned int MAX_BLOCK_BASE_SIZE = 2000000;
 /** The maximum allowed number of signature check operations in a block (network rule) */
 static const int64_t MAX_BLOCK_SIGOPS_COST = 80000;
 /** Coinbase transaction outputs can only be spent after this number of new blocks (network rule) */
-static const int COINBASE_MATURITY = 100;
+static const int COINBASE_MATURITY = 15; //qtum: change to 500 for prod
 
 /** Flags for nSequence and nLockTime locks */
 enum {

diff --git a/src/test/data/base58_encode_decode.json b/src/test/data/base58_encode_decode.json
@@ -4,7 +4,7 @@
 ["626262", "a3gV"],
 ["636363", "aPEr"],
 ["73696d706c792061206c6f6e6720737472696e67", "2cFupjhnEsSn59qHXstmK2ffpLv2"],
-["00eb15231dfceb60925886b67d065299925915aeb172c06647", "1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L"],
+["3a7bec98866810a858ba17654b276c539f34217e384e478ed1", "QXuEerk9BrJ8i4g6kh5hhwfMnJwcBQf7MJ"],
 ["516b6fcd0f", "ABnLTmg"],
 ["bf4f89001e670274dd", "3SEo3LWLoPntC"],
 ["572e4794", "3EFU7m"],

diff --git a/src/test/data/base58_keys_valid.json b/src/test/data/base58_keys_valid.json
@@ -1,34 +1,34 @@
 [
     [
-        "1AGNa15ZQXAZUgFiqJ2i7Z2DPU2J6hW62i", 
-        "65a16059864a2fdbc7c99a4723a8395bc6f188eb", 
+        "QTGimdqxhLrHTg1ekXbRtM5RcnWTMQTHpy", 
+        "49242c3fc70f63c25eb13644ae4f1fa76a902ab6",
         {
             "addrType": "pubkey", 
             "isPrivkey": false, 
             "isTestnet": false
         }
     ], 
     [
-        "3CMNFxN1oHBc4R1EpboAL5yzHGgE611Xou", 
-        "74f209f6ea907e2ea48f74fae05782ae8a665257", 
+        "MWBxtkzqskQgP8FwVfcQ3j1hfNWPjyUT2w", 
+        "f4805f8685693c7494bb61acfd4dd0d42acf2e92", 
         {
             "addrType": "script", 
             "isPrivkey": false, 
             "isTestnet": false
         }
     ], 
     [
-        "mo9ncXisMeAoXwqcV5EWuyncbmCcQN4rVs", 
-        "53c0307d6851aa0ce7825ba883c6bd9ad242b486", 
+        "qQXeMVTcggrkaeqzm6uLmvW1ERrGfTs8SQ", 
+        "4c74bc208a6a7ddd56f06cdff08f975ab6d90c0d", 
         {
             "addrType": "pubkey", 
             "isPrivkey": false, 
             "isTestnet": true
         }
     ], 
     [
-        "2N2JD6wb56AfK4tfmM6PwdVmoYk2dCKf4Br", 
-        "6349a418fc4578d10a372b54b45c280cc8c4382f", 
+        "mXSh8akDHVRgMpkUBiPy4nYohiAGm3mvwB", 
+        "a770ac151f808a94f84258a7a92fd68a3fa5f30c", 
         {
             "addrType": "script", 
             "isPrivkey": false, 
@@ -72,35 +72,35 @@
         }
     ], 
     [
-        "1Ax4gZtb7gAit2TivwejZHYtNNLT18PUXJ", 
-        "6d23156cbbdcc82a5a47eee4c2c7c583c18b6bf4", 
+        "QiQgDscyG9rH1jsvS2YF6Q5eJSjvH37scB", 
+        "ef2f42b9aab9880ca2579fb117192fda45929e88", 
         {
             "addrType": "pubkey", 
             "isPrivkey": false, 
             "isTestnet": false
         }
     ], 
     [
-        "3QjYXhTkvuj8qPaXHTTWb5wjXhdsLAAWVy", 
-        "fcc5460dd6e2487c7d75b1963625da0e8f4c5975", 
+        "MCjcohtDcMcZaRBJYSZy9rTauP4ezsxrho", 
+        "350aa6e457ac1e0905ebf3e232a8185834998959", 
         {
             "addrType": "script", 
             "isPrivkey": false, 
             "isTestnet": false
         }
     ], 
     [
-        "n3ZddxzLvAY9o7184TB4c6FJasAybsw4HZ", 
-        "f1d470f9b02370fdec2e6b708b08ac431bf7a5f7", 
+        "qMm3cA8PvCHBnSrjGkP2jybSLtFjWazv3h", 
+        "2e152cf08932e5ed377a71f2f75165982445b48b", 
         {
             "addrType": "pubkey", 
             "isPrivkey": false, 
             "isTestnet": true
         }
     ], 
     [
-        "2NBFNJTktNa7GZusGbDbGKRZTxdK9VVez3n", 
-        "c579342c2c4c9220205e2cdc285617040c924a0a", 
+        "mShE1jB3wssnBWw33LkjBLXDRzkTrW9791", 
+        "7357a545101f57e7137e80132b47e496cfc93218", 
         {
             "addrType": "script", 
             "isPrivkey": false, 
@@ -144,35 +144,35 @@
         }
     ], 
     [
-        "1C5bSj1iEGUgSTbziymG7Cn18ENQuT36vv", 
-        "7987ccaa53d02c8873487ef919677cd3db7a6912", 
+        "QLjSN1pxpkTLY7MvYJZkP2cJYy9RdgV2P7", 
+        "0168d3c607ff538a74fbc74335cabe7e5bc4a354", 
         {
             "addrType": "pubkey", 
             "isPrivkey": false, 
             "isTestnet": false
         }
     ], 
     [
-        "3AnNxabYGoTxYiTEZwFEnerUoeFXK2Zoks", 
-        "63bcc565f9e68ee0189dd5cc67f1b0e5f02f45cb", 
+        "MPAW44rvgfd7HpPGiYQqyGDbwShg9XQCb3", 
+        "a770ac151f808a94f84258a7a92fd68a3fa5f30c", 
         {
             "addrType": "script", 
             "isPrivkey": false, 
             "isTestnet": false
         }
     ], 
     [
-        "n3LnJXCqbPjghuVs8ph9CYsAe4Sh4j97wk", 
-        "ef66444b5b17f14e8fae6e7e19b045a78c54fd79", 
+        "qLnEJQ9sTZ71v8ZmAUmjUfTLr2GeDdtCsg", 
+        "2356647976d32ee96247118df48839621977d69a", 
         {
             "addrType": "pubkey", 
             "isPrivkey": false, 
             "isTestnet": true
         }
     ], 
     [
-        "2NB72XtkjpnATMggui83aEtPawyyKvnbX2o", 
-        "c3e55fceceaa4391ed2a9677f4a4d34eacd021a0", 
+        "mQdCaDn6BWj8aqxv7dd5CD7f6GrjXMm9tZ", 
+        "5ca4873f39d312ddda870086fa14717190ce5511", 
         {
             "addrType": "script", 
             "isPrivkey": false, 
@@ -216,35 +216,35 @@
         }
     ], 
     [
-        "1Gqk4Tv79P91Cc1STQtU3s1W6277M2CVWu", 
-        "adc1cc2081a27206fae25792f28bbc55b831549d", 
+        "QN3iR96BEXYpPABGoByqJHrepbi9x3dGk3", 
+        "0fd5d768d04b81380382d75ae3395dd3b96dcc96", 
         {
             "addrType": "pubkey", 
             "isPrivkey": false, 
             "isTestnet": false
         }
     ], 
     [
-        "33vt8ViH5jsr115AGkW6cEmEz9MpvJSwDk", 
-        "188f91a931947eddd7432d6e614387e32b244709", 
+        "MJR2wDHmM45D7WZqaAmc5pC1fjHsAkJcT4", 
+        "7357a545101f57e7137e80132b47e496cfc93218", 
         {
             "addrType": "script", 
             "isPrivkey": false, 
             "isTestnet": false
         }
     ], 
     [
-        "mhaMcBxNh5cqXm4aTQ6EcVbKtfL6LGyK2H", 
-        "1694f5bc1a7295b600f40018a618a6ea48eeb498", 
+        "qQv6Zp1hT4hc6fYBENpv3bxpNxsR2pmjns", 
+        "50b3c45d68b02fee8f530215a04936c9ebe75a6c", 
         {
             "addrType": "pubkey", 
             "isPrivkey": false, 
             "isTestnet": true
         }
     ], 
     [
-        "2MxgPqX1iThW3oZVk9KoFcE5M4JpiETssVN", 
-        "3b9b3fd7a50d4f08d1a5b0f62f644fa7115ae2f3", 
+        "mPGD6vxjdwcUnByawN36x3V1kDBab6go9F", 
+        "4db41bfc434fb8777a0b819462d9622832b9451e", 
         {
             "addrType": "script", 
             "isPrivkey": false, 
@@ -288,35 +288,35 @@
         }
     ], 
     [
-        "1JwMWBVLtiqtscbaRHai4pqHokhFCbtoB4", 
-        "c4c1b72491ede1eedaca00618407ee0b772cad0d", 
+        "QXuEerk9BrJ8i4g6kh5hhwfMnJwcBQf7MJ", 
+        "7bec98866810a858ba17654b276c539f34217e38", 
         {
             "addrType": "pubkey", 
             "isPrivkey": false, 
             "isTestnet": false
         }
     ], 
     [
-        "3QCzvfL4ZRvmJFiWWBVwxfdaNBT8EtxB5y", 
-        "f6fe69bcb548a829cce4c57bf6fff8af3a5981f9", 
+        "MGM1VhtoagvZWqbieTdx6gnTL1Q8o4h8hv", 
+        "5ca4873f39d312ddda870086fa14717190ce5511", 
         {
             "addrType": "script", 
             "isPrivkey": false, 
             "isTestnet": false
         }
     ], 
     [
-        "mizXiucXRCsEriQCHUkCqef9ph9qtPbZZ6", 
-        "261f83568a098a8638844bd7aeca039d5f2352c0", 
+        "qZmEmZ8v2PHN8RkcceyTnXNDY1dkZ4M5YA", 
+        "b1c000a5c01a925ac63aba190fd727aa578865d8", 
         {
             "addrType": "pubkey", 
             "isPrivkey": false, 
             "isTestnet": true
         }
     ], 
     [
-        "2NEWDzHWwY5ZZp8CQWbB7ouNMLqCia6YRda", 
-        "e930e1834a4d234702773951d627cce82fbb5d2e", 
+        "meU9yGt8UaDFT8d8xqbX9FLuRdxzPCQC1D", 
+        "f4805f8685693c7494bb61acfd4dd0d42acf2e92", 
         {
             "addrType": "script", 
             "isPrivkey": false, 
@@ -360,35 +360,35 @@
         }
     ], 
     [
-        "19dcawoKcZdQz365WpXWMhX6QCUpR9SY4r", 
-        "5eadaf9bb7121f0f192561a5a62f5e5f54210292", 
+        "QMhhBFB7CA5TnMmzudy9PaCUtNSnVYM719", 
+        "0c0c7cca923b27ce16a7dc3b1ef2cf90c4dc1fcd", 
         {
             "addrType": "pubkey", 
             "isPrivkey": false, 
             "isTestnet": false
         }
     ], 
     [
-        "37Sp6Rv3y4kVd1nQ1JV5pfqXccHNyZm1x3", 
-        "3f210e7277c899c3a155cc1c90f4106cbddeec6e", 
+        "MEz22R5T37ouiBcPUC3yrX9oywiyvjGETu", 
+        "4db41bfc434fb8777a0b819462d9622832b9451e", 
         {
             "addrType": "script", 
             "isPrivkey": false, 
             "isTestnet": false
         }
     ], 
     [
-        "myoqcgYiehufrsnnkqdqbp69dddVDMopJu", 
-        "c8a3c2a09a298592c3e180f02487cd91ba3400b5", 
+        "qUgQxiVfRf612JPHGYQXYCJsfXvPAjTgJ4", 
+        "79fdcd5120d473e9563174f361dc2d0f3b64e025", 
         {
             "addrType": "pubkey", 
             "isPrivkey": false, 
             "isTestnet": true
         }
     ], 
     [
-        "2N7FuwuUuoTBrDFdrAZ9KxBmtqMLxce9i1C", 
-        "99b31df7c9068d1481b596578ddbb4d3bd90baeb", 
+        "mM1otDmWDBR8eRYW1cZ6FNnnfeXFdeThHP", 
+        "350aa6e457ac1e0905ebf3e232a8185834998959", 
         {
             "addrType": "script", 
             "isPrivkey": false, 
@@ -432,17 +432,17 @@
         }
     ], 
     [
-        "13p1ijLwsnrcuyqcTvJXkq2ASdXqcnEBLE", 
-        "1ed467017f043e91ed4c44b4e8dd674db211c4e6", 
+        "QZkrTnUscWstdYxBNvRBeiNmhH4uK6YyyQ", 
+        "9046fee145e2502de4dee588bc2c591e4b55fb0a", 
         {
             "addrType": "pubkey", 
             "isPrivkey": false, 
             "isTestnet": false
         }
     ], 
     [
-        "3ALJH9Y951VCGcVZYAdpA3KchoP9McEj1G", 
-        "5ece0cadddc415b1980f001785947120acdb36fc", 
+        "MLY5aKYgSL4aRn4igPHxrrnGQauuhFFo8i", 
+        "8a9d0331596f6141cfecf610e138b2ba1ccc0b4a", 
         {
             "addrType": "script", 
             "isPrivkey": false,