diff --git a/contrib/testgen/gen_base58_test_vectors.py b/contrib/testgen/gen_base58_test_vectors.py index 505e40441..934d1a808 100755 --- a/contrib/testgen/gen_base58_test_vectors.py +++ b/contrib/testgen/gen_base58_test_vectors.py @@ -22,7 +22,7 @@ PUBKEY_ADDRESS = 35 SCRIPT_ADDRESS = 8 PUBKEY_ADDRESS_TEST = 115 SCRIPT_ADDRESS_TEST = 198 -PRIVKEY = 176 +PRIVKEY = 163 PRIVKEY_TEST = 239 metadata_keys = ['isPrivkey', 'isTestnet', 'addrType', 'isCompressed'] diff --git a/src/amount.h b/src/amount.h old mode 100644 new mode 100755 index 1ea6235df..a811eb3f8 --- a/src/amount.h +++ b/src/amount.h @@ -23,7 +23,7 @@ static const CAmount CENT = 1000000; * critical; in unusual circumstances like a(nother) overflow bug that allowed * for the creation of coins out of thin air modification could lead to a fork. * */ -static const CAmount MAX_MONEY = 84000000 * COIN; +static const CAmount MAX_MONEY = 160000000 * COIN; inline bool MoneyRange(const CAmount& nValue) { return (nValue >= 0 && nValue <= MAX_MONEY); } #endif // BITCOIN_AMOUNT_H diff --git a/src/test/data/base58_keys_invalid.json b/src/test/data/base58_keys_invalid.json index e383f3e09..a30cab694 100644 --- a/src/test/data/base58_keys_invalid.json +++ b/src/test/data/base58_keys_invalid.json @@ -6,147 +6,147 @@ "x" ], [ - "gZXdHjj9QCnNz5KnSqrXo2w8XghqUaYQmoFxMFaks8ZTLCcu2LtWmWFTNH3HdXQ46yJNha24p3T" + "CUexF32umavNaipSt9uZP5oX3PH4cjMGvaQfMcsSzuCfcF1VJexu" ], [ - "6vFieKyF36RmFmvMaBVC9UJyQUm2b1xmYRhwJY97tv4p5LF68FF" + "FfsyG4QaS1xxDPB7a4sWvxk5FDv5ndbULh" ], [ - "cQWGj8MhCtKbN26j23EPbuTPXZ5pyPKuYFFTBJLxQvCWQvJEMBEXW" + "5CVrTqiHDvP2kEeyvN9XLg9BGre47Y9WSTTYoorVXLwu9fNV7vT" ], [ - "JBoefAMfPKWWaUYPo5edWZvvt1CCjaTCPcpLbtVPvmajm1RTZnLTxgtCxM9QVEf8if9u7Eg88fV1" + "2FTkJkoh19EHA4HZK5updDUTooiuW3TSzTSFqBjSRVFjZMM9pFYS9rj7BbW34GEbSvUjokKMmhLH" ], [ - "TbxPvvXwEtvLwVJGsAzFHqskzVcHVkSYporbcVXfkUSsgFewgEsf" + "hyE8j4oakq6RgNRJMPvh32AsrBwq6HkjQJ62v1uteqBYLYqwgcEMqKaRbcTBo6tGqJbcayyYX8N" ], [ - "2NUDYkhC7duHz13gNFxkwPdL1i2UATDDUAgYzE7Lhg3VkLxpCNkqThs6SR6zMiiNzQer6RZPURqf" + "R8AbS5eG9a8pam6AseTTduJReFJzt26ctxo5u3GaVUweG5kxVV7xh" ], [ - "LgcotVvFQgGHygDWCkkyqVgyctGTe3pH4G" + "ZL1PnC6wsJARSD6uHS7V7nMrwjqgyGShNh" ], [ - "5mfqm4pggSkz238Tju7k9UhnHpvuSNbYKckmXKV29KBwYFNdCZBMRfbaikVNyjvz3Mj2rHpYtF7wg" + "ZrGZvTP1YaG6HvZm9HhKmyjzjKKxQgiCiNGFct73za4bBo2vBPXS" ], [ - "2U4ajn8ASmYcM42hDCGqi7rFCKuzZJ7nNWUgjeRtQdrz4kKVS7t6iG2QEE4xABbuoedzK4ya7u8B" + "8ZmkwEoxaJC9rJhWTVwfUcYw2Bifu6xoRXk7cWS3gqW2yFhHKK5" ], [ - "2PGCEn9m7Vx1hcwjZzvm61UBfdm8rynZcNb" + "cVQmKShs2cwSLwXSQeoKuZ2friSuWG5JJuGWDo2QM1uQRk1TCXGv" ], [ - "2iKcv8HMvVtbHVEmfPPp52AMbjLQqgvbFYt" + "DXXUjrG31q1druSByJs1DJa9yZxEkjSfQxQ78u9tqdgpyJ6AmTSrC2EXjnKcDt5fLvUGBcMcdUp" ], [ - "uDpgjm6HCQypJFQcVTmqv5qHioEhpsvZb1rsQX4ivTSwEPaZBp" + "21MiBmjENE9V2y9ypN7XesqW4BEMwHQyRrwFwucMhG8eqt2tf3YuHS6bpYUJvvMYSZmgY1phesUL" ], [ - "4MxF1GvQDokfTcUm9BVfkAgnUdd1QaMo7jx7zrbvtg41YWJPecL" + "SmHmkVDxm9meFXSDiy2xVvqPFn5J2HP1kmXMWyoJLAELCxo96GBD" ], [ - "cQcyPZ6SYhkauD8rywrqVYhoib1qfLN7o8BMjsTFziCrmtppGuAw" + "Dk35jfsqvjDgwJxi2o5sQEg4spYFF31KmrpXnKaxskJq2AaUEsGCyBnxU2vki6vzE6fHQknpsBd" ], [ - "5ngBnqMF5sDmGqaA42FXWuK1TornGT8irTU2jggc66NN6B9Pw7LH2qgYU7Msr6MLwNLxpnKxai2UV" + "iCmMyk5sz3jmXAYTDKGXHEMNVvZ7xotM2VNZ61jF1EwXKjFRU2tB84e2Lem2Qqq9fupJi5Lc2XL" ], [ - "cRSUJiBwxSUuswwFWRpk2fdBLK6KWHby3mgNyTRTpEMs7XJQ3xkbT" + "48DCv2c1W1xSjyvYKSgt8BLZdp1BotEdbYevPJyYi9hTi8q47Hq" ], [ - "2KtV23FPhBCmkPYE43kXfJFm5bvzGaGxEj5" + "7VFAWavGaUzDVAZHtG2nqmZKHvycbwssGmQ9vEBBvAMgpACwdrjS5akZvAhxxdBTDkU3zkTr4McZU" ], [ - "25xmYrwhzccp4mK4x7DWJQ1KYqKcw6ckso4TraMXnRhn1aimYFPWEVFCgcfjxgWH9tBHziipv4isE" + "75AmACPrAigqr6vQSXaxuJHqyEP47eaUzHUBrxey73UcjRcEMSK" ], [ - "5mqiJJe7ej7245THhVmyhFuNekhCJkotVpeuQvstRKDdW8wYUdqZFyPRqFPuen7AEaSu69AiEzYJp" + "RCjNuXLHsBdE18djY6qm8qgJuQWxvbeJo6eWQmomkLzN5msZHVX7" ], [ - "cN6EEuVvKaubeqiqVfDSyGA72UoZ8j8KPPRahQ57jxuyBMdaT19vR" + "6zknX6zFG7Bsd72NPWDu5K29Q6vFhxLBSzusgwCYe9grnBS871R" ], [ - "wVwfGNa9BkYKseBzr7Vb458bZqTXMQL94V" + "44a9J9jfZufrqyQUeH3U6FpYQBZKo6sUeeT9dvtjUWV76jDNXgFj89FdiiQ6RwnLBLxXmy82RKx" ], [ - "HfLPJ1eL8KGMhmHXSptJnSe4oBmXzMZ1PfvnKWewBdv9vhEiSVmevKjgwHffL9oM24YNAj5zAau" + "HtH5cdgszyPGxbTj2XmRbrGwrq5rHydxZt" ], [ - "Yk5B6MRro1YEay6CiX1Qj8qHY1R5o3c4EsXN644EAmjB2JMrgex5" + "21JyYtmcAxMEwZU8xMstr3LeMaGxnQNMYL5HEZVmt3v7SgmxgRcBDWaPgfKVsbeTAoecQ3JajtDh" ], [ - "LbW5JEaVWMLuMeiRhUQ3vmPzzzQ8sgXTFme" + "RFvDPL8kyvxPwWeJqGvbfYDmtaNADxXT6nSfvwK4ALuT2CbdH3xd" ], [ - "FwVS4Xy2KUEypF76i9n5dkKvUM1YjbyRYJ" + "2DeVC6Nix5hy1y3yF2pDwxzxq3kgiMbVgAtj2VKxwEvfsCiwGfhmkUz55WzWBoyPcrhJBHXx3PTr" ], [ - "T3Xe7hU6cgBveFinLV45SE8WHT1aJ6xEBXkyAqAtj4CqfKPb3ZEG" + "6AKqsfsW5kXgRUKKxuRVf1AKt3bmvAshjsvriApAHUKQk7fdvmA5" ], [ - "M8LH9iCJBTzgSjTE5y8RtSLo3vabSv6RWjLr54pZHqXZCBJtkEbV" + "DbdSji3QQQDa4rmAVNKPGw9nXvDJa5JYY9qCrKu718EkTQdyAL8Qha1Bo3MtCvXoG8PvYMrXPtx" ], [ - "JKAsgoe5RRWDFruerwz2TVEifnGLkHkMiWkJzm9Y1KkDpMXW2nssdyXaHfQzPoxqvazpTEmRPe6" + "DTxYmXeFGn3kd2yM4DtYcQVFJHCgenQKWK1b7G65QkqTNTJNTHPBqopaxqVrVNLhZLhHhnWXPdj" ], [ - "7sTp4xUuNRta4baVDHf96n7fqba2NJ1DjAnYXYswEh1xm8hbZJF" + "3xx4WBQNoMW7z7U7NguzpoPcpwx6FwkNvF63fPSXLLEfqwdTg3fYVwTJsLNqeakWNMEC89RdWor" ], [ - "cUSxdRJwpEP8czXTLPSXPNYAB75xyFi7AYwc7azPvGqQLcyEb7jq" + "215TJThp81Q3NoyLv8HMuD2mNr6zUXBaF9EDprAWG2oLj6EFbbM3QJgKswgnXKhTdQ4kSnJKhaiH" ], [ - "JKSnxB43ogNNPW9F27d8amwPWimdRLG95EUCiSrFJybfxVFPUjBFZFdeGdjzBygXCi7rinvS6Rz" + "3w5W31uPZvDtFBX69B8aaZnXnFBM7oaRPXZWpEUCzv5mE8dnqg6" ], [ - "tJgWcJ8FqGWWuX6DGeMxnCKjfhm2osTu6Q" + "2DnfdUNNw8mb4dDgCN7ZuaX5HoxvwNywJLHfR338267Ncm9wBkX5jkpCH9GFA5QdGRP7N8QYv2Qd" ], [ - "2UDnhZGfuHzAKd4HSo99ALrVax5TgKxzALJR1Ct36ibrZqXsnwRBsVvKneDYWxiQjcpnQ3NWK2as" + "6aix5qvsjrkzgGQLXpmi2LEjNKitHEkaAr7nuqbwbdeFppRf76wqaFzkhX7asDoBjTwzapTtWJ8iN" ], [ - "JCK4Kx3L6ZbHkSJwPYJPijK6SNgQDutbtE4XAxgTFgFWmFx1w97XczfKptjZKn3THosoZ2k81mb" + "2UPDWhPXkb5HdQ5cFfa7mEo6rhEoSB6gzJvjoiGEqgRdQjSBEwJDZo5EUXA2TEUD1q3UAVLyzb7B" ], [ - "AbnXu1Rgaemzvbg1tVgTBjah1owubWPkFZ" + "Xez8J7kZkLakdH5NwxdAU4UeNfWo4uBKn9g1Hna3AXaR7a24WfJm" ], [ - "928wcz8UaXY3tHmeseuFAfYLNSBjrs8jdxKRGkJGk5Wyx2CvhmkPzTrPKporxAKqLs9bAh29Btb" + "DWdi7Twu9bWm6u9cW2Y9wvSVd4p66N9NhuNWu7VsRqsFHmfWhMaK6HgSbfjazCVYK46eobKJzQF" ], [ - "Qp7EyuWueg4cazBtJW3uYKwLmL1uR3PkgDVoBsGSMZWu1njcRRJ" + "2763nRSr2PHmEVqZNKHGC5yGk8tf7M14eBrgsCqkoUmDWdsVdujiwNHvwpMnhaKqZJPFnQ7qqTek" ], [ - "6R9r5RHQdN6Fgk9K2PHSx1sXKpk8QskdyzXtCSNAfJmehY9DD1Dd" + "2U8zvn5qPpGsttqUXGG3iFMQ5WBVMk1M1hRTfyiRV6JY9rWJMT8voeVsQct5gmn5kQPatPfWLS3F" ], [ - "271T9hGPSeP9QRTb7g5tRZYT7ADbJhivFb6" + "UdTvMoVEDK96Y4Npe2X7VfoEyv5M6yf4effW5RzzWHhnC6WxL6DL" ], [ - "2x7WjATScgcSHNpGMGz8TKKS2g2E7Qkg9x3CMuGxxCDCHy1rQr1RFEjdjP6Lw6qksGJLcp7i6U6" + "SsC8cEdtPjERCGf2feu5ucsveRLSfQEQ4R" ], [ - "2jwUaPdB93pxW5dJpoGjq3RCKyBEqTqfcq3" + "451NhUBcDXvmMbyhmYuS2X4Yq43sJ22JRQyfNK6m6a94sZrcyHHM7Z1HafCAp22ikpTJEKbCpxL" ], [ - "7VkJFJwgtTaqCXks8JrxuJEkEoDGGUrGQBBUp2SVwb93UWAQ6d3kYK8y3u1CQKZi6f8fZWCoDpr3pP" + "2fUMYCcoe4pkuchWXJXaDTfY5QXuSpv5hz3Kz15hNNCuqS1dVom" ], [ - "T4UVQQSBJdRVkNvgNxkmcP9mVtWoBLWqmzZo1T8Z9GDNPYj6rV1s" + "BF4a2dPQJBzaw7TQ2fLdbUeuZHfdRaYMPGi8Jq79vUkXjVJkbTBArPLeZ4XtvUpEtQkXRUbsuBwJ" ], [ - "2UA3wL1KGhNh2UR2HYRPVgJ9Dx32qEGapePi8wp1SZ9UmTCHV5fkudMA2CZ78t7KKDAQWtNB3PFc" + "33uc13DgiZ8LfVQSxrd7ioGRNseZQCFn62fxC32CuN78K8X763Z" ], [ - "gcBstMZS9mKRXeGiYQJ5vG2ukiEKRirxskCEqZ6rmFwWuh2kyNxwqsd6pnduEdV7Zvvkgcu9VKt" + "218ndfK1RZeWGpGQAMTpPi27LUUkD9dwMJhNSB7iwiNXwTcixNkwyZKhKEFrxNDWvvUMkQSyBEiD" ], [ - "5mqKtSZGj3bHtMgmSDbt9Qmp9NnQ8ECnYQ8b54eJKERw5stGCTZ42ECVxeTWU1JTC9o8Tewe4WxEW" + "5S4purRMtEi8Fn8AsB71CsK7cSDr3RfLdGcVNzXPH9SWAdgy4yrv4evWMenircM1bjJdGeXnvonk2" ], [ - "31q9AKvsdwuSP2znBRMLugqALxQ1aSfAqWbT1gyS1tsjFFj2ZZMSGAEE1kyFsC6H6fy7v6yTTtb" + "2UMczY5TMr5jGjdPZqTtxwABGfELPxBZBoCopaULu1brpgUs1Ezr1NLUh3bRXERKz8Eya5coaUFb" ], [ - "35YhSwzbJMECakq9H1SiGcQmMyckD5A6nDkk2tMMFCbyVjpL7aV" + "DGYkj9bZb4YNAm4C7uyosbbrAQdNUS3RRkYD1Uy4k784342hYhoP" ] ] diff --git a/src/test/data/base58_keys_valid.json b/src/test/data/base58_keys_valid.json index 3e9130978..45a52e79d 100644 --- a/src/test/data/base58_keys_valid.json +++ b/src/test/data/base58_keys_valid.json @@ -1,7 +1,7 @@ [ [ - "LdwLvykqj2nUH3MWcut6mtjHxVxVFC7st5", - "cd463dbc6f8076c7021f2766b36ea7e19c5c9e2e", + "FNw4NsyQm94QsGDqYz5Gi7MaHTsXPF6yXG", + "bb9a0f19b1232f7d162801cf1331c35457ed9859", { "addrType": "pubkey", "isPrivkey": false, @@ -9,8 +9,8 @@ } ], [ - "3QiEMZmknJkHxz9q2VjTCT1tvUicLvBpdZ", - "fc85afab90ad569ed50fe8771d70aff8a7eb788d", + "4bsKkyri7WQ4HMYc5tSKFQJDXnWGWbegcK", + "f31e9ea7408f5b2fc12de928a06887053b4b3d70", { "addrType": "script", "isPrivkey": false, @@ -18,8 +18,8 @@ } ], [ - "mmCKZS7toE69QgXNs1JZcjW6LFj8LfUbz6", - "3e4a9a4a79dcad8800b6cfcdf102bf98064b7454", + "oZB7KohBdHQB6sir6ZHzproALBcysjo9yW", + "b2dd0e15700f9e8f35ac5672e6d99d62ce65255d", { "addrType": "pubkey", "isPrivkey": false, @@ -27,8 +27,8 @@ } ], [ - "2N5X5FB9Cro2qW4Dww1pEKYXMhQt8PK6KHM", - "86a0ddc5ce64594f0b84d96596657e1f5e0af7f6", + "2NkMR3vrjykv2vRLcQSMuzTRL7KeWyoCKJW", + "309a25429b3649bb43b23390c3ac75d55e4baa7e", { "addrType": "script", "isPrivkey": false, @@ -36,8 +36,8 @@ } ], [ - "6uyyEQaLajn2bVG4DQ9LkwKqdTLWv5fxzSgBBwFMhZnY6SHamHF", - "716bbb0c59dc95f658b169b09c9ada6b106d79ef637dc0a1361aea83b67f3281", + "6V6ZFDRVV6V9mrKFXeKFrzsTgaqyCjcCA6GhqAdCcvjfkafK4XU", + "a3f9493a8bbb3e60246199e8dcee3b2a55112473e84082cb120dff18012ced8d", { "isCompressed": false, "isPrivkey": true, @@ -45,8 +45,8 @@ } ], [ - "T92ej9rAJ2HEKBtXKpcQEB88KMjBUW43uVxzwgAAYmm97CbDfuB2", - "b257a0d8b63aac2cbac1f6b57c73ee6313650a000ac895456f633e05e1f276b1", + "RA9Vx5thKESfP8vfw3LKuQGgQxVRA9FdsLHVW3T7LMRZQwemmpRv", + "4e909daa060d235226dd157a7fbfff14977496452e3c5a68f187c956e7ab2294", { "isCompressed": true, "isPrivkey": true, @@ -54,8 +54,8 @@ } ], [ - "93UCtAocH3kKPwoqEcjNGR1qi9MLkhQio2vMjWCMdEsBNwTKszg", - "f8270343a5cc4936c0f304520700b9a9f443dddeb5b2bfa9ef8414d126e9835b", + "924RHLkwUnZmzaFKK9YvTMJqGNt1pZgnDz3ZZummmW3vdq43hKu", + "3e7260996eb7e65b6aaa49d937eab182fcc64867d9dc9e67900baf80a9a5e0f2", { "isCompressed": false, "isPrivkey": true, @@ -63,8 +63,8 @@ } ], [ - "cU3MMfRXJpVuVXKdkqn1x8cqEHz4AfyBmVFj7CvBUdApAZYo6Lj8", - "c0bbf61af02667b9a7c172c2d4bfa64ac9d4553f7ae19fb295c06e77cc799296", + "cRZ2W1sH3jHzswEocAksN5U4QByjRbut8MDKJTh2tYQGu15B4o58", + "767ce8a64757cf5568d42f24934b06170eae3c762a40923e7b1d0a56e0410d22", { "isCompressed": true, "isPrivkey": true, @@ -72,8 +72,8 @@ } ], [ - "LWZR9ybwmT8vSXP6tmrBX4b6nE9o94AjQG", - "7c57bc50a38d8377ad55260f29f2c8619846ef08", + "FDD13HFPh4cpFnnYg54vjRW8qqHhh52uwE", + "50ecab91a0f6c0e75075d7d3c8cfddb970d7cf91", { "addrType": "pubkey", "isPrivkey": false, @@ -81,8 +81,8 @@ } ], [ - "32wfwbXojzQN9vYFQGquFTt7sqKnB8Phyz", - "0dbdaf6928107d60299f5069367c4cf07fa9b6e5", + "4YPC2EAPpLLQvLqrQtTqVN1QXKm2vJAPh4", + "cce423074721ef7743e01ae210ae72906f8d2354", { "addrType": "script", "isPrivkey": false, @@ -90,8 +90,8 @@ } ], [ - "mvJg85FLYqN7xAcZeFZRVg7pMbJ53BqKmy", - "a237653c5ae7e18e840d6463d380701ce3ba5035", + "oPbkidiKDge2NdkmhZHhVeiAPhoyDKFeTm", + "49d4feaea6d2fbb9ff21b588a63c89a8163a43a5", { "addrType": "pubkey", "isPrivkey": false, @@ -99,8 +99,8 @@ } ], [ - "2NCGcqUHf4q4vE2MZD6bnaVzFUSKPM4WCDX", - "d0ade0e231a81794ed1baa081604de53ddd8b083", + "2P1EyWe7WesZSZJurKX79e2NZXYSNnqgnGm", + "d3ec379eb592bde064208d62fabc36a9e09691a8", { "addrType": "script", "isPrivkey": false, @@ -108,8 +108,8 @@ } ], [ - "6w3nZ8BsJLuJwe42QpFAwCZC9EFz4e2k1ewhRT9ab2poUv8KSu7", - "fdc80a3b189a9d64a1fb8e5a9905d92922f77e135a235a06046147f10d4f09be", + "6VmyDwnfsQo7ZBG1ZwZGBADduLk3Fa2BvQdMFhRREshjtigVFZK", + "fd777d4abe9cb4f0e0dbf703bf4efe3b457070056e39ab80f7970d62d6e3454e", { "isCompressed": false, "isPrivkey": true, @@ -117,8 +117,8 @@ } ], [ - "T5EAeSR4zfUGvNiA4iCVPpV8Gz6ZUGAT94bsBqTv3kd81hNQCgzY", - "40eab9b09d0469a7d9f84dae6bc5f98199e0b187fe4e74013cab437f9306ea00", + "RARXPDJc7dDJ6veVs8k13CySSVUHpXeUuwr6gDD5ovo3fV7WjyF5", + "56cf01fb6b8e72d44685bb62b51ea11df9e109ee1880c20ca78cb169742052eb", { "isCompressed": true, "isPrivkey": true, @@ -126,8 +126,8 @@ } ], [ - "92hDYngM3s5oLTK6Fsq1JKLLSgL5NdarzLm8r9ymzEfQzCB24cJ", - "92001dd4cb225cdc0cf9fe2f824c807ffedd5235c9c0ca014949d0793fc66868", + "91pDJSj7rZta4yWCvtB9LWP2Da2jhd6nAFTk72qAfNGndp2NBVd", + "1e30648dd2bb34c878d9a4c681b3f48b326c9613befa9eb82337137adf914364", { "isCompressed": false, "isPrivkey": true, @@ -135,8 +135,8 @@ } ], [ - "cQFFjska277aBhcbCaEdBSixz1BXEgnLoGYECu9mKJip3GBco8CL", - "4f8210f4e6830d16fa8818d37fa9aed65664a20f3c41bfa5b502cdc8d1173dcb", + "cTQiaJKsMoeSqU7jqDZeYfpWkWe75HkpKpSMJ3yfQBwnxeuyyc5L", + "ade3623280ac856c4459849b5156b48d678cb262774e0588c1bda08af2ab82a3", { "isCompressed": true, "isPrivkey": true, @@ -144,8 +144,8 @@ } ], [ - "LWkdEB9SHUfuBiTvZofK2LqYE4RTTtUcqi", - "7e766382cb564021bcbc273e23569dcaed536ac6", + "FQANj551tPGHTUyScPb4X35GVW6z5uYKY4", + "c916e894968f41dba28b01cff442b62c6c142a1f", { "addrType": "pubkey", "isPrivkey": false, @@ -153,8 +153,8 @@ } ], [ - "32cjrquumLmwSmBrNCbkU5UTUmtgetWqaL", - "0a290d74c272ab52dec1a87ce88e75d29c94fe5a", + "4PB79mhb6uEonrzrSY8b6b7hdy9XkVkpaV", + "67e1f2b13fddab2e69f8b8805461822cc93fa281", { "addrType": "script", "isPrivkey": false, @@ -162,8 +162,8 @@ } ], [ - "mtei3esVvHhww4Rw9FYnMdTUTVvbpWhLfF", - "901111ab28cf850a5b6846e94e8c0c4a505603a9", + "ocGjoSQcine41YXoxct6JnGTuto6vLiGFP", + "d4d5f60efd187088c80656fc64defb38ca782aec", { "addrType": "pubkey", "isPrivkey": false, @@ -171,8 +171,8 @@ } ], [ - "2N85CqWKWqfZ5Hc9qGXWmr5JKZzMqZCRDPM", - "a2a4c41bd7150d28aa730140cebf7aa5341e2619", + "2NksoQLSq1nUE51gEu47WarT3A2N2fabJcc", + "36594864155bdbc28e64c352609cfe2a45a1c03a", { "addrType": "script", "isPrivkey": false, @@ -180,8 +180,8 @@ } ], [ - "6vfWJ2KcJLjvXXx8aZNsLcQQnxTvXA38ci22BvhprTq5QpRS6k6", - "cb30eec426333b2396d2362d4a380d7f6a4ae50a2701309a53f500fa389c166c", + "6Ty9HNH67fvMPdgztpRGJsZfkTzcGtaQR91MUVYCtf6XCC8vqC7", + "0f71f91823bb25610c148b958a3ec740a06c83bbd6ee38c3a4209b0d8741210c", { "isCompressed": false, "isPrivkey": true, @@ -189,8 +189,8 @@ } ], [ - "T9xQZ1QYhGyYp7wzRQuLdfm1te8BwrnvWsibt6GXuK58Xoq2wryN", - "cdff0814191533898aa1e6291f2c77e1a1945a732f70b8f09aadc637e9241e59", + "RAKh5jX74EUCNNkHmZWZQEWL7keTQ7jQuMKTBHkYRvQC5SMDdd7P", + "53ceda659bb2962c8306f03c52cc11489d12e3c9f211e899dcd59d36db37c336", { "isCompressed": true, "isPrivkey": true, @@ -198,8 +198,8 @@ } ], [ - "93C56vYXBM3XycR9M9pDNY333bTLT8KeqTpRXKSncruKpeuvfZ5", - "d3849230c2d8bd3590708a8ff485deea6a73916a664255f95179282b146854fe", + "939E3Cqi6XsvCf4Mn8quncxziA1Q6dkwpUQfQTie5V4pdP6AVuk", + "cd0e49fb7830262dadbd3dee7ef743570f0fe4dca75995a21c74cff3d31c7933", { "isCompressed": false, "isPrivkey": true, @@ -207,8 +207,8 @@ } ], [ - "cV7TW5gn8yJjrVy4mfYLDY1tfYN7o81tjeubEeqWxzyjdcU7Bv9F", - "e0af129330504deb99dd989339b96d77ce3782a852b8e61a4367394505abc3e0", + "cNLdBXa4MAfYmorsH6ytvxkPEHL9efJgVk2GwW6hHChyhS9Gg3jU", + "16987caa0193a21ae084235798556b6de85b4cde1205ec70bff893b9bc60b357", { "isCompressed": true, "isPrivkey": true, @@ -216,8 +216,8 @@ } ], [ - "LVcGHJcTv1ctR6GLRXxR4SQSsycdmQ6pwZ", - "71e9734a1283f2368bbd5a397d3c7a22610b2958", + "FLBhWf5pP6fnDtrNZMnLqxh8DRWai6kmfw", + "9d7680ca27cf59828fc2b9c0c202d7760835fb68", { "addrType": "pubkey", "isPrivkey": false, @@ -225,8 +225,8 @@ } ], [ - "35CcFdsWEiXv4cuHjR8G54FYvrrDtm4WUm", - "268118c8299cd5d8d3b9561caaf8c94d4bd1af44", + "4XGyYeg12nGEoFCGyTF3FiU5sFoa3RT9Dg", + "c0bf19ed2d3fd2e0067ce6303165f0a39158be5d", { "addrType": "script", "isPrivkey": false, @@ -234,8 +234,8 @@ } ], [ - "myWBvpVEeY86YvJLb5kwH2iWbdXPGjTtZk", - "c54d3aa920e78e56b72c0076d36e99bc87058397", + "ofJjJzoSaFvhrFwXWUVhdesEgNYX1yrBkh", + "f61ec2d77a117f9141a0511cbcee5dd0fdcf4f7d", { "addrType": "pubkey", "isPrivkey": false, @@ -243,8 +243,8 @@ } ], [ - "2N54Ew2vPqzA9PxG89rB1LM8MVfgePiCKqV", - "818db8c869c5911d286d37088de9020cca43f702", + "2NuhE6t5zTqv6qepxw6c7qk4x9oHKkm72my", + "971274fd3e161673f73aa3ec3f344205adac2a30", { "addrType": "script", "isPrivkey": false, @@ -252,8 +252,8 @@ } ], [ - "6uM1BTu9jkS6cMfFTtxzutmcNQYVpTome57XhxES6xKiiN7eM4v", - "1d7bee7a5f4be2bcd945a4bdce28a479bb1afcf4d925d29de0124325bb55277d", + "6UFKmNoJcYLV5MB3bU9hEmFCQnec8EBwvSiwBQr4tMPN6xE4oZa", + "342f80a12aa12d03adcfb345de94c4b9eb3f52df6e2be5d618b8d0a5b1bd69ea", { "isCompressed": false, "isPrivkey": true, @@ -261,8 +261,8 @@ } ], [ - "T6gDa2FYoYuCDpeJy8ePrdTVqxxvZ9H5nCqmdVCiRvLBWr1jymE9", - "6c27d6190e8c49919b7c0919d1ca1b033c2b72b03234728d0b092087983f2544", + "RBgPEU99pxuYofJnYRvFDmLgYxx8JWqn4NSxoKy1KPYWeQeUsHMW", + "7c4a50bdf8af410feb5edf89cda60df05e8200a940d9fe719cba46af00ccb7bc", { "isCompressed": true, "isPrivkey": true, @@ -270,8 +270,8 @@ } ], [ - "91epwsbfDsLwAum2kYeibW9v3cyM9ALeHxFoR1wh7g8w58gihCj", - "08e0d6cf0999a1427830e034b5281c8112d707d463da05d993d8b2b66985d91f", + "91rFwggpZKYqjbGwER5zhyfDkSMCB7BpNeCmGbfo5PK2XxnePxn", + "22d56e35e98921e11f9461032d628107bc12be066637c921f9a8937c466b5e3c", { "isCompressed": false, "isPrivkey": true, @@ -279,8 +279,8 @@ } ], [ - "cTNjHC1zu7CifxVJ7g9V16LKVokd7D1XuEvqTtA88uwTsRUFXmWj", - "acdd979c5e6eb9e619dfede5c7112af1057442c8799c1e1d85d7bf59892c923a", + "cPDoXu1KSVUS9yxkMZSGbgvcjhpYRNAbVi3EMn9ec3GyLaFEajvm", + "30ec7dd2a1f234186aeb2620275725b55aabe6a3e56855dd9c007792a5cb46a6", { "isCompressed": true, "isPrivkey": true, @@ -288,8 +288,8 @@ } ], [ - "LPD8ZwGjE4WmQ1EEnjZHrvofSyvGtbEWsH", - "2bb8b0991f396d7f411c2227af00cc09d1ae0adf", + "FBXVvZ41JagR25XW8yF2STyhZjSmrN2e11", + "3e7c0460197a487e6a2a8c8095e7c5448541f8c3", { "addrType": "pubkey", "isPrivkey": false, @@ -297,8 +297,8 @@ } ], [ - "35Bjf3NUkU6CNqUFB4HnkaYqN3VPMYwUED", - "2656dc6ac50a5bdeb80348b9097af31e74698f44", + "4Kt4rEZuLKxUKzeiEjCvb9cxavDb9TtLUs", + "43c093d0b999f8f76e52acf09d4e55856d0eae4d", { "addrType": "script", "isPrivkey": false, @@ -306,8 +306,8 @@ } ], [ - "mhv2Ti1xy9CsWoYgnEjehEunbhFiyFwLAp", - "1a4d4bf230aabafd3a425770b8b98700bf06e370", + "oLiVRhHYvmym6t3Lkhp8VuvSLQ8bppiP8b", + "2a32c39ac668faf7a3f82f67bca5f4deea5d47e1", { "addrType": "pubkey", "isPrivkey": false, @@ -315,8 +315,8 @@ } ], [ - "2MwyQVPME89pGMxuX3fRwEgfXtgN1Y1wB7e", - "33dabd6dfda94c9c1ef1654a3c3b1e0984a7aecf", + "2Nqd9sibDUtUFbTcCiFNLtdhuL8m4CwWyom", + "6a6cc2f2d35a6cc6d0c3852169cb8f4beecd8b54", { "addrType": "script", "isPrivkey": false, @@ -324,8 +324,8 @@ } ], [ - "6uqTHcTC88EcZ8RQJDoH7dFfH46E8ZNpThbEKXCiQ12ag2GeHQ7", - "5e15635f0be1e9717529fb2b65b0d430355f0f5db5811b47fc6545efbe082b23", + "6U5u5wiHmsye89HPtKtmnT9i7JzQ32N36LsQrtgh2DJfaFTPcFn", + "1ec8a5410ebea78a807d9f90e4b94a6884aed68628b6e8558421a2f9fa149753", { "isCompressed": false, "isPrivkey": true, @@ -333,8 +333,8 @@ } ], [ - "T34vLND26MHR4j1L8qsmojWcHtwYcmDdibMrsgo41SRYDDDdJzQe", - "007c379af039e5472c784a1f41ccea5de8b8d6fde03139644f12294a5a4dc20d", + "RAL6pwyjzMGyLW56xpGeWLmBfWXCnJvMJPZVcTbzFW8tLn1Eq22b", + "5404c4ec2c29b85e1edae8793cbb149d54ec5a8261cec3d86f98e25ee0a3196f", { "isCompressed": true, "isPrivkey": true, @@ -342,8 +342,8 @@ } ], [ - "932VXf7wK3qQTGzudkeHWME2iweTTdyfyxQV4HqWLZsocbVQMgZ", - "bdc494c6c492168886d7d19fe35c4e67c477f8e19bfe1b50a4b28a7f0910ac02", + "91fVTk9g72MqJg7v1uP3V9w5Zy4sT1xVz2S6UYooJCZroRQUJuP", + "0a62d6c2618a2c335448fde5d6c10ef9e53e0d1c297ab6581751bf8f5b28d589", { "isCompressed": false, "isPrivkey": true, @@ -351,8 +351,8 @@ } ], [ - "cUNY2YHa2TZRNMKBjypnZ1kh7LnPzgBhapKQgqh8MXGGVQTqdqQS", - "ca9a6a553f353255f2d91fde1718bd1f86c40c0b16f2aaccf8efefe242f5a7b6", + "cNDGpvPKzYf6YsXZ7Ls2BQXv5a31mge1nWuWXaug5g7YkUtdzLTP", + "12d065276e81191e8329546c618b6a043affbad02fc664ee7973189cd778c452", { "isCompressed": true, "isPrivkey": true, @@ -360,8 +360,8 @@ } ], [ - "LPGeGFBPCVLHdGVD1i1oikzD92XZoTEVyh", - "2c62b9d0c13b499167506863248f473416b18850", + "FKSwo4oBRLYHEFc1HCubNzuzyugthwyQc7", + "95608a1cc58eb3de940f0af74435d118ecdf3c5d", { "addrType": "pubkey", "isPrivkey": false, @@ -369,8 +369,8 @@ } ], [ - "37h7vEB4v3jpqxKvX1qqJ5xZaqzLj7NPyN", - "41d5c23a8188270b32d0afce2e11e4c3028afe6b", + "4X6m7AnPGYKEQCbRuF1eoZcVLmYxrNpExn", + "bed08ece0dfbbcfb858c66a1e561519bd28eb5b0", { "addrType": "script", "isPrivkey": false, @@ -378,8 +378,8 @@ } ], [ - "mhvk8vH4LaAgUBUJsU4UtL4KSWLavssToW", - "1a701609b7d938f932d9517f965eb938ec45d067", + "oH5HUJHUHdQKdYUTVDi5KufXgCLdVa9CBq", + "0241043a724bc4bc670a5f6e0595a15ad4f4052b", { "addrType": "pubkey", "isPrivkey": false, @@ -387,8 +387,8 @@ } ], [ - "2NBbbBFBoKk85mhvTJH4tc11U1zh4oqp7SG", - "c94c4561b8ec99cddd540dedc67380c6b859ae00", + "2Nwegg9812fycQo9y3H54oaxp75ZfmaacLi", + "ac87a49f6cc91588e2191211af788a5d0a7e230a", { "addrType": "script", "isPrivkey": false, @@ -396,8 +396,8 @@ } ], [ - "6vQqYTYdTXyHLcAivoZ6N2pginHXkZj9DF8uu9rroj5jT32joQn", - "a9e2a8019c11e6fd215f5c2ae834c7f07207723cac79b4e22744800c97212ac1", + "6Uie2aiPBtD7MHps7XZkG2gfxBc9wJ6utYVfa9BSkMHxW2kHJ8h", + "72351186d6de0a207b0656431b507dbcacf2b10164d73429952fa2f44be9c4fb", { "isCompressed": false, "isPrivkey": true, @@ -405,8 +405,8 @@ } ], [ - "T7qqfYACj4bdqNMm9ZMMNtbaMXRzePBpL59msQiWw7i5JRuDLFVB", - "8ef16edbbc8996a1be1c8a8d7de566a489a84484912060471158c0d20fcd42ba", + "R83RfXpMTt8RMuzdRxrRb9LeFF9118s5hDMSNUjuMLJgqCf4LFV9", + "0fc3f633e480f0356a91e72c1b2176ba096fd4df6e0b206301ca4384ee7ec6c7", { "isCompressed": true, "isPrivkey": true, @@ -414,8 +414,8 @@ } ], [ - "91pvMZgXhzBit7xx2NrbgMiuVZJep46gTCdvFkQTijTA76Gzxfc", - "1fcbd613ad91f41e062a66b11299585cff1639775df447360e74fbeea1e336c8", + "91sy9EypMhUTrAJAmccDzWFfTHz2zxgA6LmWDiLKxqEUacbZm9N", + "26b79c72092067ee7b2f58a1503b52698f4f756ac765462e73c62fbcd33122a9", { "isCompressed": false, "isPrivkey": true, @@ -423,8 +423,8 @@ } ], [ - "cVWTK7AxBVgndSKS6Xs54XonuEh4NUhaHVtyzrWhHfQ2rLWdVrNy", - "ec83a732c245dc6df111d6412aa1b2ed78072ae3ebaa499660ccb7f013adca8f", + "cVhCHHTBuxDx3FUfhepDECgQD7jmVjkHPdj1PBn53xbeQhrGfUu5", + "f20a2df1f3e5b0fa4049c469a5d39f9d2f71a1df36ab6fded5852b8269e07c66", { "isCompressed": true, "isPrivkey": true, @@ -432,8 +432,8 @@ } ], [ - "LhLu7S8qdG7YZR1GgSP8g4aqN8nXCRLkzX", - "f2a30c60e4abcbbdcdf7cb34520b742ae07b6018", + "F78awtieY15S32C6nc6Nd6bb8H83X1sirY", + "0e4623d050258c6b07df848e2f82f438b9ab544c", { "addrType": "pubkey", "isPrivkey": false, @@ -441,8 +441,8 @@ } ], [ - "3B7BZ4asi1qP4jQmo4UjshAp4ZtgmpA7CW", - "674b274f2be5747793d2529972d964f1cfe9f985", + "4MDWiUBji5JxDtAgtiBtLBvCPUZjZPWgku", + "526632cae7a74768ee27f534fbcf7031e439d173", { "addrType": "script", "isPrivkey": false, diff --git a/src/test/main_tests.cpp b/src/test/main_tests.cpp old mode 100644 new mode 100755 index 721f0d77d..83d5d757f --- a/src/test/main_tests.cpp +++ b/src/test/main_tests.cpp @@ -16,7 +16,7 @@ BOOST_FIXTURE_TEST_SUITE(main_tests, TestingSetup) static void TestBlockSubsidyHalvings(const Consensus::Params& consensusParams) { int maxHalvings = 64; - CAmount nInitialSubsidy = 50 * COIN; + CAmount nInitialSubsidy = 100 * COIN; CAmount nPreviousSubsidy = nInitialSubsidy * 2; // for height == 0 BOOST_CHECK_EQUAL(nPreviousSubsidy, nInitialSubsidy * 2); @@ -51,7 +51,7 @@ BOOST_AUTO_TEST_CASE(subsidy_limit_test) CAmount nSum = 0; for (int nHeight = 0; nHeight < 56000000; nHeight += 1000) { CAmount nSubsidy = GetBlockSubsidy(nHeight, chainParams->GetConsensus()); - BOOST_CHECK(nSubsidy <= 50 * COIN); + BOOST_CHECK(nSubsidy <= 100 * COIN); nSum += nSubsidy * 1000; BOOST_CHECK(MoneyRange(nSum)); } diff --git a/src/test/sighash_tests.cpp b/src/test/sighash_tests.cpp old mode 100644 new mode 100755