Merge branch 'v0.12.1.x' of https://www.github.com/dashpay/dash into v0.12.1.x

2024-12-26 12:32:48 +01:00 · 2016-05-13 09:03:35 -07:00 · 2016-05-13 09:03:35 -07:00 · 2cec48631e
commit 2cec48631e
parent 9031c5e3cb 25c4341311
10 changed files with 185 additions and 183 deletions
--- a/contrib/testgen/gen_base58_test_vectors.py
+++ b/contrib/testgen/gen_base58_test_vectors.py
@ -17,7 +17,7 @@ from binascii import b2a_hex
 # key types
 PUBKEY_ADDRESS = 76
 SCRIPT_ADDRESS = 16
-PUBKEY_ADDRESS_TEST = 139
+PUBKEY_ADDRESS_TEST = 140
 SCRIPT_ADDRESS_TEST = 19
 PRIVKEY = 204
 PRIVKEY_TEST = 239
--- a/qa/rpc-tests/blockchain.py
+++ b/qa/rpc-tests/blockchain.py
@ -49,11 +49,11 @@ class BlockchainTest(BitcoinTestFramework):
        node = self.nodes[0]
        res = node.gettxoutsetinfo()

-        assert_equal(res[u'total_amount'], Decimal('98214.28571450'))
+        assert_equal(res[u'total_amount'], Decimal('98178.57142879'))
        assert_equal(res[u'transactions'], 200)
        assert_equal(res[u'height'], 200)
        assert_equal(res[u'txouts'], 200)
-        assert_equal(res[u'bytes_serialized'], 14273),
+        assert_equal(res[u'bytes_serialized'], 14277),
        assert_equal(len(res[u'bestblock']), 64)
        assert_equal(len(res[u'hash_serialized']), 64)

--- a/qa/rpc-tests/disablewallet.py
+++ b/qa/rpc-tests/disablewallet.py
@ -26,7 +26,7 @@ class DisableWalletTest (BitcoinTestFramework):
        # Check regression: https://github.com/bitcoin/bitcoin/issues/6963#issuecomment-154548880
        x = self.nodes[0].validateaddress('7TSBtVu959hGEGPKyHjJz9k55RpWrPffXz')
        assert(x['isvalid'] == False)
-        x = self.nodes[0].validateaddress('xwJHtLhWeRzaDXrQqYuDaF1NrwYbgMWYDS')
+        x = self.nodes[0].validateaddress('ycwedq2f3sz2Yf9JqZsBCQPxp18WU3Hp4J')
        assert(x['isvalid'] == True)

 if __name__ == '__main__':
--- a/qa/rpc-tests/signrawtransactions.py
+++ b/qa/rpc-tests/signrawtransactions.py
@ -33,7 +33,7 @@ class SignRawTransactionsTest(BitcoinTestFramework):
             'scriptPubKey': '76a91460baa0f494b38ce3c940dea67f3804dc52d1fb9488ac'}
        ]

-        outputs = {'xxE2Q5yK8qgJnytakFyeAoxXirWJH9eaSW': 0.1}
+        outputs = {'ycwedq2f3sz2Yf9JqZsBCQPxp18WU3Hp4J': 0.1}

        rawTx = self.nodes[0].createrawtransaction(inputs, outputs)
        rawTxSigned = self.nodes[0].signrawtransaction(rawTx, inputs, privKeys)
@ -74,7 +74,7 @@ class SignRawTransactionsTest(BitcoinTestFramework):
             'scriptPubKey': 'badbadbadbad'}
        ]

-        outputs = {'xxE2Q5yK8qgJnytakFyeAoxXirWJH9eaSW': 0.1}
+        outputs = {'ycwedq2f3sz2Yf9JqZsBCQPxp18WU3Hp4J': 0.1}

        rawTx = self.nodes[0].createrawtransaction(inputs, outputs)
        rawTxSigned = self.nodes[0].signrawtransaction(rawTx, scripts, privKeys)
--- a/src/activemasternode.cpp
+++ b/src/activemasternode.cpp
@ -84,13 +84,11 @@ void CActiveMasternode::ManageStatus()

        LogPrintf("CActiveMasternode::ManageStatus() - Checking inbound connection to '%s'\n", service.ToString());

-        CNode *pnode = ConnectNode((CAddress)service, NULL, false);
-        if(!pnode){
+        if(!ConnectNode((CAddress)service, NULL, true)){
            notCapableReason = "Could not connect to " + service.ToString();
            LogPrintf("CActiveMasternode::ManageStatus() - not capable: %s\n", notCapableReason);
            return;
        }
-        pnode->Release();

        // Choose coins to use
        CPubKey pubKeyCollateralAddress;
@ -126,6 +124,10 @@ void CActiveMasternode::ManageStatus()
                return;
            }

+            //update to masternode list
+            LogPrintf("CActiveMasternode::ManageStatus() - Update Masternode List\n");
+            mnodeman.UpdateMasternodeList(mnb);
+
            //send to all peers
            LogPrintf("CActiveMasternode::ManageStatus() - Relay broadcast vin = %s\n", vin.ToString());
            mnb.Relay();
--- a/src/qt/platformstyle.cpp
+++ b/src/qt/platformstyle.cpp
@ -25,7 +25,7 @@ static const struct {
    {"macosx", false, false, true},
    {"windows", true, false, false},
    /* Other: linux, unix, ... */
-    {"other", true, true, false}
+    {"other", true, false, false}
 };
 static const unsigned platform_styles_count = sizeof(platform_styles)/sizeof(*platform_styles);

--- a/src/test/bip32_tests.cpp
+++ b/src/test/bip32_tests.cpp
@ -38,44 +38,44 @@ struct TestVector {

 TestVector test1 =
  TestVector("000102030405060708090a0b0c0d0e0f")
-    ("drkvjJe5sJgqomjLo3qGVgD8fcPo43UZPgaaskFEjpgSzpwfyEji7NK1mrdUUC1rtqdST6MW4eFxxt1328RR312x9XZsZUAxNo7pTssukwBT5Tx",
-     "drkpRsmwKURS9g8uDqs1tGTJwh16JHZ27Q49iCXHQ2rD7fFVix4LRp47wHSYAFD8cPPSNoonYypuVXbPig9vkyTtxX3CoeF6B4KB9ozvafgNEj8",
+    ("dpubZ9169KDAEUnyoBhjjmT2VaEodr6pUTDoqCEAeqgbfr2JfkB88BbK77jbTYbcYXb2FVz7DKBdW4P618yd51MwF8DjKVopSbS7Lkgi6Y7Ckb8",
+     "dprvLJcNFzfZn6ywEjid4Ver3tsK3puSZFZr3oxCtC1cPdxVsZzjQwGPHvpLxZ83zP37V35uVQNG7GYHjxtkEUWhUKrFTt1bEj49EvPzRfWNPQH",
     0x80000000)
-    ("drkvjLuVs1zJu2rKwexyhS5mYeVuNs2umm4bZMg8hv4Zy28xLX2tXbr6tzytFTaZe9XyTJe4vsoPhX57zXPYz2mLDR2bm6yDJ722yp1U4adNnEx",
-     "drkpRv3MKBiuEwFtNSzj62Kwpj7Cd77NVUYAPoxBN8EL5rSn6EMWr3bD4RnwwWZU26mQ5rhUvH9mstSGSSBeQZk5kb7isWvER224rpdn1q7ivwn",
+    ("dpubZBGW92WdKjuxwnqSwXKfNcLuxffArXhpWof4cw4ie3Db32UJYR8QEG61EpAKHqVZFiGg5Yj4EhTAyXwm236KK1gTX8c5MuLKrgpGQGTaNAV",
+     "dprvLLsnFhy2sN6vPLrLGFXUvvyRNeTnwL3rjRP6rHPjMq9nErHuqAoUR5AkjpUPQ6R5C5ybrhh8VdPATivTt4ntGPvmXkgjUgm2ww2qroEB9Ts",
     1)
-    ("drkvjP5d4oYCHjjPn71RRgye9PPZSF21mnntVgLyJBqNuewAa4Y2FQGQrZt7fY3946FKR2G7iJFVp7Zbaq8NTMwDu4rY4Jp4mk2JcYYFMYERRv6",
-     "drkpRxDUWyGnde8xCu3ApHDpRTzrgV6UVWGTL8d1xQ192VEzKmreZr1X1zhBMZkXd2YSXwTAj6kCxbPgaNhsXuY4XkcAPHsxUmnvXcx9YgAKCuZ",
+    ("dpubZDSdLp4WiSo2nEstfnDXyMEa23eGrZS7T8KuDCqXag1oGZySGDYiBpzEetcthnCuDRtiryBAMHweZqgaVNGCzfWPpLSvqYLbVRM3h9fkKv6",
+     "dprvLP3uTVWvG4yzDntmzWRMXfs5S2StwMn9fk3wSZAYJTwzUPo3YyDnNe4z9sfT12C7eAjHfXHZaLLabfSh1Qas3ZRD3XeTYSXtcjMDPeReKGg",
     0x80000002)
-    ("drkvjRgu7LN3zcaoeGoWgHP1WPRhfPtY3LNsqDaeYX8Y5XJbyuj94A6qm1S3DZDyVxgdmYMrKgE7C48a3AGfATUkxX1NeCnCrh5zLETPSpexfvd",
-     "drkpRzpkZW6eLWzN54qG4sdBnU2zudxzm3rSffrhCjJJCMcRjd3mNbqwvSF6uby9bG3w3QUZKZh8P1DaoaSd7vTFer3pjuSWdi2s8thNBM9vCdA",
+    ("dpubZG3uPLtNRKeSeQfyvNcuLMGiFCWo8726nfZaTY8gkYPEgRAZ4yP96GYACuoj9eeDZwzTUM9mjEWd2ApsCTok47fEQER4vVQHD7GBnSUChBT",
+     "dprvLRfBW2LmxwqQ5xgsF6pitfuDfBKRCuN91HHcgtThULKRtEzAMj4DH5cuhut4yFhc9dkgFzEUzkAUpsBSbRW4AersQ9D1hNmqE16S2LQbbCi",
     2)
-    ("drkvjTvHwmV1B6FnikHENYb6Ptb1kDBGfvh5GhTwoUf1PxsDM1MW7voCxatxttDMukqNErV2Tgi4Eo2gbacfFkuxg7UdYzLPgsypLvNEbN6fekp",
-     "drkpS349PwDbWzfM9YJym8qGfyCJzTFjPeAe79jzTgpmWoB36ig8SNYK81i2avNc3vTN7CcFwUvhHpfkGmM5KLzbrEds99XcBnraHsAXgmc3EUv",
+    ("dpubZJHJDn1KboKRit9hcdpzDrS2L1oXkhLJE9SsiVfA4ywr3Wnv8k5WHr15tEo7ZSnx3G7dcMdimyQjabAsHmEwmi8VK1yFkgJ7DoB2vzheMZ7",
+     "dprvLTtaLTTj9RWPASAawN2onB4Xjzc9qVgLSmAuwqzAnmt3FLcXRVkaUf5qPEHXRv73DRtNsuU3uZceJ45tnr3QN3SuoPJ7FTbYNyZbXkHHL6B",
     1000000000)
-    ("drkvjVe4RT6FJDdzF64gV69phbb1YSkaVRW74wrW3m39c3Fi48kteM3sDh42Xi8Jm1v5iYmZy2drmzjHC11gMcQoXNdkRXkUVMZT9sz9qZGZMZH",
-     "drkpS4muscpqe83Yft6RsgPzygCJngq3D8yfuQ8YhyCuisZXor5WxnnyP7s6Dn9oxqaSic1Wique8sCsGwMSrR1KyCHQUeHqJhcHaCitRvHHSKf",
+    ("dpubZL14hTcZivhdFDw9jBPiXZS28FNqaC9L2PqRxn3JH4LLkeCJfALAYxA9X4i4QhsfWxQB7hZXKB7LB1ZtPcjncyHcBZPLZ9sk2knxB9dPD6v",
+     "dprvLVcLp94yGYtagmx33ubY5t4XYEBTezVNF1ZUC8NJzrGXxU1uwv1EjmEu264jLqE7pqHdfGSzkc9mJE6GKv48V16T8t4LNNMFfK7xGuw1qYe",
     0);

 TestVector test2 =
  TestVector("fffcf9f6f3f0edeae7e4e1dedbd8d5d2cfccc9c6c3c0bdbab7b4b1aeaba8a5a29f9c999693908d8a8784817e7b7875726f6c696663605d5a5754514e4b484542")
-    ("drkvjJe5sJgqomjLnfLbbqHR7p7ZJEcz5JqQZL2y2mRGyD4YGDkuHX5xCko4pJ6qc5zQMebHyJv8MxWHjv9eABx7HSZpRQNRDHcUnFZ22sRq6So",
-     "drkpRsmwKURS9g8uDTNLzRXbPtirYUhSo2JyPnK1gyb363NN1w5Xbxq4NBc8WJzBntwXcrZDJGHMmddapCt2oPrbZtMyG4KLKQDuj4d9wbaoren",
+    ("dpubZ9169KDAEUnynoD4qvXJwmxZt3FFA5UdWn1twnRReE9AxjCKJLNFY1uBoegbFmwzA4Du7yqnu8tLivhrCCH6P3DgBS1HH5vmf8MpNZPvMv6",
+     "dprvLJcNFzfZn6ywEMDxAej8W6b5J23sEspfjPjwB8kSN25NAZ1vb63KipywJcu7AtbCj5qLEgpiPNaUqVcrGtuQ5hB1vJ5qP4xspB2Dndk4mqU",
     0)
-    ("drkvjMuq92NoHnZRJvvtjcfJBcX5fCNEnHKh7VnLCaSj3cvVxCCsrnS2MbNKPm4jQAzqZy5TqXusm3MFu5aL3LeXd3E6hT767dkrujfgU3isKDC",
-     "drkpRw3gbC7Pdgxyjixe8CuUTh8NuSShVzoFwx4NrncVATEKhuXWBEB8X2BP5pFzRxnN2Wo3CGh6Co3iAiWrMgMeW7XNGEjPhtPerUXiJrUD8m1",
+    ("dpubZCGqR2u7iVd4K4oMyhuC1aN6EzzVs3xv4wmG7bSsie18eheHsbiKgrUSP7eV3rxRNNi4zCqYJDjJt68Y5LyWidsxTUjxBS59ncUUoiV7Hou",
+     "dprvLMt7XiMXG7p1kcpFJS71Ztzbeyo7wrJxHZVJLwmtSRwKrXTuAMPPsfZBt8AuoxS38k5A8hESpXzcC1FfqBQT1vLQvUVtmZ8cwavn9q2tk8V",
     0xFFFFFFFF)
-    ("drkvjP4tPdQKfgjXUo95A4ewexCe3wb9KmVPCers7yMVhMgtQVSLUfrLZf9v19Jr9ubwMV11VNmV4FmrZkSfpF8eMBgjEXj9UN1sn7wHJwWQJmy",
-     "drkpRxCjqo8v1b95ubApYeu7w2owJBfc3Uxx378unBXFpBziACkxo7bSj5xyhAjyADWqvk7vyHtjFoYpbxFd63xn5QxvgxxjUQ7ueFsF5LRhHsN",
+    ("dpubZDRtfdve6PoAUw1YQ9tqUv3edkDQQY8cA6qo2zMeNNmX6zskVV8dtvG2zVtbobZX9tdce3h9bS9uYkzsrFTdSnLazZN1YALAezk5eZACqNH",
+     "dprvLP3AnKP3e1z7vV2Rit6f3EgA3j22VLUeNiZqGLgf6AhiJphMnEoi5jLnVUetYDAX2yQ3uiS5sYVidEzSZZ1abDmyMCjEY4rsjNGJvJWqMTT",
     1)
-    ("drkvjRsroePFqL2iaQpDDioWcu8sPUTeRxQeX6Miy31q1F3L5KJVnBP3TZYHqwVywnJDwfTZL1rihP5geYhgj9ZbcX9dpovzguT5htcEZKiw6Mb",
-     "drkpS11iFp7rBESH1CqxcK3gtykAdiY79ftDMYdmdFBb85M9q2d86d89czMMXxwbBviYEhUdiay7fME2vf2n8wVA5tnDpjVYKW6J84HyYyycqPW",
+    ("dpubZGEs5euaG36MaYggTp3QSrysyH5uWj3sUYLet41ygG7xmpjunzfLnpeQqJ5jbUFok56AUgnPEZTjdZFtm9tai7oVaqZrkhmNamR2u21VLF6",
+     "dprvLRr9CLMyofHK26hZnYFE1BcPPFtXbXPuhA4h7QLzQ449yeZX5kLQydjALGrWZvNDLvkkf1WUH6AvwwmbcSXxbhbGUyG3PAqGDAh3PuPivHi",
     0xFFFFFFFE)
-    ("drkvjT3ticKcSizRsN3oxCd3zQq4JCw1Uw39Yo5cVkiEr1JaXfdRsrK3z5uPUbdV99pfu77C8WvRjzQYJBs5R2g7Ksr66iFVFCYVa7gp6JUy6u3",
-     "drkpS2BkAn4CndPzJA5ZLnsEGVSMYT1UCeWiPFMf9xszxqcQHNx4CJ4A9WiTAffypM6pnGmL2Qk73iocjn89etPemjTPeg2rTi7vTeJVcfjAABd",
+    ("dpubZHQtzcqvsS44sVvHCHrwpNg4t1ZGZhgNWF4YQmiPX2PDEB4qtfbMKM1WTxDEnqnFhWjoHBr6HAnbHCRHT316RUVwrjtMJzrnSzVcRwYawkr",
+     "dprvLT2B7JJLR4F2K3wAX24mNhJaHzMteW2Qirnae83QEpKQRztTBRGRWA6FxyauCLkVtW3SxqHTfTkWm4ry8PSTHYGSJuoMXNrtYkhZTfLdWhK",
     2)
-    ("drkvjUQvg3Y7xuJfcdEhgGkjyAD2hGU7jFxECxhVuY4jUoAAbry13VEpAerPYzhmGjBNRAKRQSRqdhRXncvaF8N1e8hfjt5aBZqEFQszktZUYXN",
-     "drkpS3Yn8DGiJoiE3RGT4rzvFEpKwWYaSyRo3QyYZkEVbdTzMaHdMvyvL5fTF5LyyNBtpad4KANvVpeJnL1fPCkspiC7TXYMX8FeA1e3hMDsE8f",
+    ("dpubZJmvx44SPcNJcm7AvMzdo843H56Np2bTAQgRpZ4t9pEoJNQR4JX7VuxWYMHWvR8xDZx2Z7MWAsoamdUnH8gzjjMXVuiSFN9X8Hgo6Zfpw3T",
+     "dprvLUPD4jWqwEZG4K84F6CTMSgYh3tztpwVP2QU3uPtscAzWCE2M4CBgj3G3PFuMMqZvouBFavH7ZbCockUrhogLX1A7mJranzcF837YG1usdU",
     0);

 void RunTest(const TestVector &test) {
--- a/src/test/data/base58_keys_invalid.json
+++ b/src/test/data/base58_keys_invalid.json
@ -6,147 +6,147 @@
        "x"
    ], 
    [
-        "37qgekLpCCHrQuSjvX3fs496FWTGsHFHizjJAs6NPcR47aefnnCWECAhHV6E3g4YN7u7Yuwod5Y"
+        "8212abd8rrzcJmBG9n7VmSpaMfPRXhyHkQtNXFAMPCUqQTF9Kmsk5VF3b81x1qt9tRsQ2REKQ6j"
    ], 
    [
-        "dzb7VV1Ui55BARxv7ATxAtCUeJsANKovDGWFVgpTbhq9gvPqP3yv"
+        "5CPYCiRk7LjiYQc45GQTgqNjYw5tWeCZd1NWvevf6SQfJvDm9vK"
    ], 
    [
-        "MuNu7ZAEDFiHthiunm7dPjwKqrVNCM3mAz6rP9zFveQu14YA8CxExSJTHcVP9DErn6u84E6Ej7S"
+        "2UB8YkLAsoJWEsw6daxKvo5W4NVjLSB8Bsko6UCWMrLnoFKgETXdKa2XcvoWdjeeLbKqRcaWwGvq"
    ], 
    [
-        "rPpQpYknyNQ5AEHuY6H8ijJJrYc2nDKKk9jjmKEXsWzyAQcFGpDLU2Zvsmoi8JLR7hAwoy3RQWf"
+        "9sW9vnbLHfdcqhU2n5bLAFUksSgCiMBVmdn6Pae3iTYo49aSqZeS"
    ], 
    [
-        "4Uc3FmN6NQ6zLBK5QQBXRBUREaaHwCZYsGCueHauuDmJpZKn6jkEskMB2Zi2CNgtb5r6epWEFfUJq"
+        "2FeLT8g7q25cvVmUjQnXvTt7rpWDtRjq2oi9F9zj3rLWxNKSoKcPLob6TEB2RAeumauRzj5Em5uL"
    ], 
    [
-        "7aQgR5DFQ25vyXmqZAWmnVCjL3PkBcdVkBUpjrjMTcghHx3E8wb"
+        "7Vbg3REusN6tagLwHkz4P71VZtp8oTTtETmaTFJfypdX4J7vBmp6CMzWpNV3RUdv7TST2nigUz2oU"
    ], 
    [
-        "17QpPprjeg69fW1DV8DcYYCKvWjYhXvWkov6MJ1iTTvMFj6weAqW7wybZeH57WTNxXVCRH4veVs"
+        "7obK6DhucEuvCinKLAUNYMPXNEFCHcErXa61wi2sMi66owinM4E8YD4rkgHVvxpv3ZGxFNXUyCA"
    ], 
    [
-        "KxuACDviz8Xvpn1xAh9MfopySZNuyajYMZWz16Dv2mHHryznWUp3"
+        "3FPe28dxJDhEmkAbGVgsT5XFpBwyM48FK4veyiQVgAKvQLTea2U"
    ], 
    [
-        "7nK3GSmqdXJQtdohvGfJ7KsSmn3TmGqExug49583bDAL91pVSGq5xS9SHoAYL3Wv3ijKTit65th"
+        "2ULU3PB7u3rxfUXKVb5mZ4ijXbj85LN99s7zess5XPZEX1DJvanHoY6dLvYnkLtQDWQ2qCq1GWSA"
    ], 
    [
-        "cTivdBmq7bay3RFGEBBuNfMh2P1pDCgRYN2Wbxmgwr4ki3jNUL2va"
+        "7VBmPmJMUFwYhgktivvqBZcPzqdKPy4S4RRTACdwTiV6wNpkpXEmp3tvDhzkqdyFhXdJ88Q5T9mka"
    ], 
    [
-        "gjMV4vjNjyMrna4fsAr8bWxAbwtmMUBXJS3zL4NJt5qjozpbQLmAfK1uA3CquSqsZQMpoD1g2nk"
+        "2Zx1G5CMrEC4Y8EBVxvepmM1aiXv7CenqUR1dZBxC4PFUv9jAAm8TUxD4SKC2ArwKawA3Y4rhC2v"
    ], 
    [
-        "emXm1naBMoVzPjbk7xpeTVMFy4oDEe25UmoyGgKEB1gGWsK8kRGs"
+        "yaWZmeqWr5Mea62ECoMPzVkXxHGDF6LtCfc"
    ], 
    [
-        "7VThQnNRj1o3Zyvc7XHPRrjDf8j2oivPTeDXnRPYWeYGE4pXeRJDZgf28ppti5hsHWXS2GSobdqyo"
+        "7VPs36WGcbdFsCBsMXExgBoMeme8T7eJ4g3UMqQrhrA2Lyys5vi3dgH43nbz1AV4YFz3ZRKLdFsnu"
    ], 
    [
-        "1G9u6oCVCPh2o8m3t55ACiYvG1y5BHewUkDSdiQarDcYXXhFHYdzMdYfUAhfxn5vNZBwpgUNpso"
+        "2DS5LTr3AgrTGoBD3nqXWDPtCMd98mkop4wxaVfRWwPFYvmpXP5hG5bKzVVzvsKzP89THiiRd3Pr"
    ], 
    [
-        "31QQ7ZMLkScDiB4VyZjuptr7AEc9j1SjstF7pRoLhHTGkW4Q2y9XELobQmhhWxeRvqcukGd1XCq"
+        "DeRXybcZve86XXanvmLG9XwFadEh8GjH2Y"
    ], 
    [
-        "DHqKSnpxa8ZdQyH8keAhvLTrfkyBMQxqngcQA5N8LQ9KVt25kmGN"
+        "7pejnWw1qHjCfAmzXoStxFZYMJ6hu1gixoJD8irtyrki5A9PHDWV798YMaH3teBadyatmdV2YvT"
    ], 
    [
-        "2LUHcJPbwLCy9GLH1qXmfmAwvadWw4bp4PCpDfduLqV17s6iDcy1imUwhQJhAoNoN1XNmweiJP4i"
+        "4Yi2yBokcAj6acLZhiNwmmA1DSzuKnz8vfJ1FHE2yJLSTab6FUi"
    ], 
    [
-        "7USRzBXAnmck8fX9HmW7RAb4qt92VFX6soCnts9s74wxm4gguVhtG5of8fZGbNPJA83irHVY6bCos"
+        "2U65F6JTxDP2YJ5XV6FiYxpWMCjwCRbEN9ygEXZ3KkbLUMjSbvKbPyCMLf6ke9kMPg9CLQcJ7aN9"
    ], 
    [
-        "1DGezo7BfVebZxAbNT3XGujdeHyNNBF3vnficYoTSp4PfK2QaML9bHzAMxke3wdKdHYWmsMTJVu"
+        "7UgNNEAfdinxDG38ByGmVwbRJp7b4q8BEznm2GXbSJFVSTyS3jiByNLU8ckDprYkqvi5bcf61SUkw"
    ], 
    [
-        "2D12DqDZKwCxxkzs1ZATJWvgJGhQ4cFi3WrizQ5zLAyhN5HxuAJ1yMYaJp8GuYsTLLxTAz6otCfb"
+        "6wzMif8TRzrnyQYAbRZShWcZo3dqKYkBVpi2JR15DFMCLzxAkVTUpsuwdTUWnkx9j1kGDyukh1Go"
    ], 
    [
-        "8AFJzuTujXjw1Z6M3fWhQ1ujDW7zsV4ePeVjVo7D1egERqSW9nZ"
+        "6YKZfgYJSh9ivzFX1oNqTiiWwhCGrZbnDCigU6N5oyiBeVUKio5ww3Zu4N6K6NHsqaR8djSh9dLfX"
    ], 
    [
-        "163Q17qLbTCue8YY3AvjpUhotuaodLm2uqMhpYirsKjVqnxJRWTEoywMVY3NbBAHuhAJ2cF9GAZ"
+        "92sWK7QesAPWS12srisHmc9q8Fz8Z5ERJcAaVwkjVKENJmL45bBM"
    ], 
    [
-        "2MnmgiRH4eGLyLc9eAqStzk7dFgBjFtUCtu"
+        "2Ua8heeYCTTsr5qgi7vorTpDAWVRGRAJKZ7"
    ], 
    [
-        "461QQ2sYWxU7H2PV4oBwJGNch8XVTYYbZxU"
+        "2A6BvvmZ86GG7TRwXyCaCvhiM5FsVFvs42x"
    ], 
    [
-        "2UCtv53VttmQYkVU4VMtXB31REvQg4ABzs41AEKZ8UcB7DAfVzdkV9JDErwGwyj5AUHLkmgZeobs"
+        "R5uiBq2rzVGhxDsq3MeGU3QKeZz8wLywaB"
    ], 
    [
-        "cSNjAsnhgtiFMi6MtfvgscMB2Cbhn2v1FUYfviJ1CdjfidvmeW6mn"
+        "279AcBMDWxh5hnfEm5kptwnfn7rEWschhdxkEzLYzEj2K3wSHfEaqV2moec6wP5w3jVy5cFhoVXk"
    ], 
    [
-        "gmsow2Y6EWAFDFE1CE4Hd3Tpu2BvfmBfG1SXsuRARbnt1WjkZnFh1qGTiptWWbjsq2Q6qvpgJVj"
+        "7VMRsPVwoj7vZATKQGj2yVEX55f2qNKDxNiw7YNJv1zjfFFzyWR1WS67tefp7fV1MpXrUhNh86e8Y"
    ], 
    [
-        "nksUKSkzS76v8EsSgozXGMoQFiCoCHzCVajFKAXqzK5on9ZJYVHMD5CKwgmX3S3c7M1U3xabUny"
+        "2V95nNKY2YtDuxyQ6K4unrkKQTmhRpVcUiXdYKxfJSrQG22tHmNojaXc5gUy1ZY6cAByCBMZZsas"
    ], 
    [
-        "L3favK1UzFGgdzYBF2oBT5tbayCo4vtVBLJhg2iYuMeePxWG8SQc"
+        "2D79xmaAZxTf2fMRsTGgkNfMrUErj5CqXNY"
    ], 
    [
-        "7VxLxGGtYT6N99GdEfi6xz56xdQ8nP2dG1CavuXx7Rf2PrvNMTBNevjkfgs9JmkcGm6EXpj8ipyPZ"
+        "7nwQ595A7nXdySFQ2pHx71xJsVLhJAeoj68MSSDHhPMxhBQDynYa5KDXEfhW8jZdZeAkraFMy7b"
    ], 
    [
-        "2mbZwFXF6cxShaCo2czTRB62WTx9LxhTtpP"
+        "7rLMRn8VSmsGV1QUfZf5xro5gejEST4fuXpokKSvqPPX8wmMabe"
    ], 
    [
-        "dB7cwYdcPSgiyAwKWL3JwCVwSk6epU2txw"
+        "J3JtSQiZ46yXNEXpuzjmA7R366BBKMD7id5PZ7cX3V5K5DcP3M9L"
    ], 
    [
-        "HPhFUhUAh8ZQQisH8QQWafAxtQYju3SFTX"
+        "21WFTGZEpLyGHqVmb7a5skPDN5oD7ocR7r6t2osiqDQf6Xa84mkh3odE1cbZ2ocTFMZbHSrLXyJr"
    ], 
    [
-        "4ctAH6AkHzq5ioiM1m9T3E2hiYEev5mTsB"
+        "7oShSMyZqoK69tWvUEwLBGWHzZFvuVV5SESa4rBe3TmNzfJXBJBP528XMMMiQxoX7fSAzhF2bYL"
    ], 
    [
-        "Hn1uFi4dNexWrqARpjMqgT6cX1UsNPuV3cHdGg9ExyXw8HTKadbktRDtdeVmY3M1BxJStiL4vjJ"
+        "KqarYQ2A4jimBefL5i1SRpbz8xn3y3P2UX1tafCgf48LXTDrKCcf"
    ], 
    [
-        "Sq3fDbvutABmnAHHExJDgPLQn44KnNC7UsXuT7KZecpaYDMU9Txs"
+        "gSzq4StFrs2i8gTZ84pw9x68aPQ3XFe5b3oK669aSd68yfFmxH"
    ], 
    [
-        "6TqWyrqdgUEYDQU1aChMuFMMEimHX44qHFzCUgGfqxGgZNMUVWJ"
+        "7UdhV95GSa6CY2XjVYfrqrwwyCScmeksu6TCqcpRSeeMbEmDydSMB4E2CCHFZ4gLoXXB7z1iWsGws"
    ], 
    [
-        "giqJo7oWqFxNKWyrgcBxAVHXnjJ1t6cGoEffce5Y1y7u649Noj5wJ4mmiUAKEVVrYAGg2KPB3Y4"
+        "2msvzdVt86YVXqkWQBJG136u11REi8cXpn1"
    ], 
    [
-        "cNzHY5e8vcmM3QVJUcjCyiKMYfeYvyueq5qCMV3kqcySoLyGLYUK"
+        "ryMiy7TSV4LfnJWeXdvT9sZgiLj6ebNg2ac6eLdSAE1N66u1SHwASam7njVBMLYuzr8ntySNoUT"
    ], 
    [
-        "37uTe568EYc9WLoHEd9jXEvUiWbq5LFLscNyqvAzLU5vBArUJA6eydkLmnMwJDjkL5kXc2VK7ig"
+        "6YnxQpwLv2PWVRw8cf5JVm1HmLP3UrQyyUMufDLzuYRg1vbut9he27XAzmLp7m4WxTz7vsriEwQcX"
    ], 
    [
-        "EsYbG4tWWWY45G31nox838qNdzksbPySWc"
+        "92g6icyL3H2XCqLiukqquX15fwBR5kFE744En5cd3X61cpANrjqY"
    ], 
    [
-        "nbuzhfwMoNzA3PaFnyLcRxE9bTJPDkjZ6Rf6Y6o2ckXZfzZzXBT"
+        "2XCxe9EpeGVMkfZqFgtAKmU2GNBpwnmukDs"
    ], 
    [
-        "cQN9PoxZeCWK1x56xnz6QYAsvR11XAce3Ehp3gMUdfSQ53Y2mPzx"
+        "6YdrW3VDyE96kBFvKghrZ6fkwVngGgJybFnrFHXfexSorcQPxzbHLqNWTSMZHkrdmeQ2ZsLCnFhe3"
    ], 
    [
-        "1Gm3N3rkef6iMbx4voBzaxtXcmmiMTqZPhcuAepRzYUJQW4qRpEnHvMojzof42hjFRf8PE2jPde"
+        "PsfkAxuhDQKQCwvuwfiVo1vdcYc4fLLr7oZ98XrMyp7SAsLAyQorF"
    ], 
    [
-        "2TAq2tuN6x6m233bpT7yqdYQPELdTDJn1eU"
+        "2k2HeazZ1apwsF3VQHHCbooreJ2anjumTTU"
    ], 
    [
-        "ntEtnnGhqPii4joABvBtSEJG6BxjT2tUZqE8PcVYgk3RHpgxgHDCQxNbLJf7ardf1dDk2oCQ7Cf"
+        "724Fw3TFoSoXsZK77FC8NfrgN2scVC8pq7SntoNgCY3oosmEZHJLcrZVKiFagFm5TLcbfuhKm8ewM"
    ], 
    [
-        "Ky1YjoZNgQ196HJV3HpdkecfhRBmRZdMJk89Hi5KGfpfPwS2bUbfd"
+        "7VrbcSqCJndcp187BT68T5eLXF3TQaH7vN57nAhNhbCyUjtvuX6rtDJYNLmXhPTSrE5dkWqifSsRG"
    ], 
    [
-        "2A1q1YsMZowabbvta7kTy2Fd6qN4r5ZCeG3qLpvZBMzCixMUdkN2Y4dHB1wPsZAeVXUGD83MfRED"
+        "8SHxzARcUKM6NdLyM4JDSMoSkA99SgZ3zP85JAEaiipxnUXuMBtV7dtx6cN1wP5df4bQ8G6MsMv"
    ]
 ]
--- a/src/test/data/base58_keys_valid.json
+++ b/src/test/data/base58_keys_valid.json
@ -1,7 +1,7 @@
 [
    [
-        "XiQbzzvmfyWytmEXQ7CjNFpUUG7Ja5jHVv",
-        "54aecdf64fb03f4112173b81340e72093c9cf944",
+        "XtLoNJ2NpPbxYsFYFHewTy6QJQCcvziDAx",
+        "c1a7e32962dee960126497b3df1fd4072c93f503",
        {
            "addrType": "pubkey",
            "isPrivkey": false,
@ -9,8 +9,8 @@
        }
    ],
    [
-        "7TSBtVu959hGEGPKyHjJz9k55RpWrPffXz",
-        "0b4287eba873cd0f3677ee7ce97729eb280ec911",
+        "7iRPy8FEHBzbChrktsG85YbDZ3SuiCxsNq",
+        "afa615ddffcfc364f952956c251bce5042e821bf",
        {
            "addrType": "script",
            "isPrivkey": false,
@ -18,8 +18,8 @@
        }
    ],
    [
-        "xwJHtLhWeRzaDXrQqYuDaF1NrwYbgMWYDS",
-        "037d357ddd27a63851ab65841d8db66a2ae63b1f",
+        "yjPCQXXeWJLFQWM6kF6dKRczZbNkSWVtrj",
+        "fd00802f8b61ccf0c1bb1c7969c832673ed546a9",
        {
            "addrType": "pubkey",
            "isPrivkey": false,
@ -27,8 +27,8 @@
        }
    ],
    [
-        "8zdcReLaADbk9m4132xCwhfXJoc4YUdJKa",
-        "ddaec8a2279b2e6783f85416da7d6e7a424b909a",
+        "8yDrsN8yRfbG678S5eVntDtAHdnuQKmCDx",
+        "ce38bb4d79dd633ba5fbc0ea1e3b85a637acdf59",
        {
            "addrType": "script",
            "isPrivkey": false,
@ -36,8 +36,8 @@
        }
    ],
    [
-        "7rLUjuWM8u8GYrN9GYz2yb6VucPBfMpyhFKenqdUaoenWkGuZBK",
-        "6793e022fcae7df2bdc027c84dfd75805219b84f2c9400b6394b96e946482db7",
+        "7rJYzFcK4nNu4oEFUZL9heG4u4XNvoXdkiCaddtQZ8oT4wMxPta",
+        "6333e256bb02f09b3bb233c17c5e86562cc39571ac2eba07a92d99d1f6faeeac",
        {
            "isCompressed": false,
            "isPrivkey": true,
@ -45,8 +45,8 @@
        }
    ],
    [
-        "XCafWPHo8D7VNrTWnFUkH1erzSXmexncn7cEzLaKGpwvyuTpyo6r",
-        "2699740a3089a4e868edb55f6a005b013ecaedf4cf76ef215da29a311f40ee17",
+        "XGCaeDGqsxPK93JHP3kJ41MEAobFu42PXkASRLXBkCx3bKBkrGMn",
+        "9296962c50327a60f78a11b6f017ea3b22182892fba9c976a765c5b014f25802",
        {
            "isCompressed": true,
            "isPrivkey": true,
@ -54,8 +54,8 @@
        }
    ],
    [
-        "92sWkxoBRLpEG2nQLiRR7s2QdsFea5p32S3AvrzKdubWH27i4Ht",
-        "a961636a98d773b9231a928b821b719354278328982852b20c6b18cecc4a199f",
+        "93VwggWoGhj1pLaEhNQqu1GSbGTTESiXtZsFrfxJ67tPgHGVoLM",
+        "fc1941692fd7d26625aad4d7f5e0c15cc45ae1a3d6aa07fab903f5f64508374d",
        {
            "isCompressed": false,
            "isPrivkey": true,
@ -63,8 +63,8 @@
        }
    ],
    [
-        "cPoLTJrWM6Gk2Zwv4RrmXfBFoipcDjU9622QcsPJjWvEvp7Ub47g",
-        "422cac1af987dbad1a5fbd9c56fb53a4a8611191614753c97a36120c0441f3a0",
+        "cNddBPFJ6PbCX2BJVR6up2p8PjtFyUy7zpbkAgRGhMmrPbCe8Fvf",
+        "1f5750a1f5703e8b1a273964c7b7fce1871cc7a43f303ec7d33ac724fdb59eca",
        {
            "isCompressed": true,
            "isPrivkey": true,
@ -72,8 +72,8 @@
        }
    ],
    [
-        "XjX3ANdcDi4ij7ZhGUtFTpCscqxXZSa4n3",
-        "60de6e11e22629783a50b307998f502fd989372d",
+        "XigZoHdsPg8qHTxUwyZFttzp8ocSUwLKv9",
+        "57b39f318f3cd120e08a5f710850c03c22c213fc",
        {
            "addrType": "pubkey",
            "isPrivkey": false,
@ -81,8 +81,8 @@
        }
    ],
    [
-        "7XJyXpX6hFWjLz3aq4d8WYoj2hh8rMuiuz",
-        "35c5cec0a705cebdb0a3b807184264c7e848c589",
+        "7qX4wLps8eQEc8vVNxodyowpJtM8NQjt4s",
+        "fd81935b46055357fd1d2af1ca12ef055f9b0cc0",
        {
            "addrType": "script",
            "isPrivkey": false,
@ -90,8 +90,8 @@
        }
    ],
    [
-        "yBhZhfv5H6ZJZ2sdk4CUJp5SnR4vL4w5Cv",
-        "a175bd5819664e237a2edd499b6b8d5c8afab250",
+        "yT9LnoTWwW8BZfMsaBzb2MeYPW9rJXrjcn",
+        "4adfa9d287098715d3d8be30157a83c14f3f01e9",
        {
            "addrType": "pubkey",
            "isPrivkey": false,
@ -99,8 +99,8 @@
        }
    ],
    [
-        "8u8Z3oWzLZJ6tAtPfaUN3dKBYp1icLMB7U",
-        "a15745f6042371d953973095d0c0cb842cfb32e0",
+        "8kPTvJRz23wKti61gMrsi2vJgs7q27A1gm",
+        "41701951c4acaf87123358d268e84c066b054782",
        {
            "addrType": "script",
            "isPrivkey": false,
@ -108,8 +108,8 @@
        }
    ],
    [
-        "7r7Ue5BA7VV5mDHQiHw8GZEPHiehC1ADGtA1cbrKfra6nX9atfG",
-        "4a0e3c88133ae4abf527753b84a0701c16ab4bd605cf2de133d3d60147b440ca",
+        "7rdDu7XRm5WLKmPaX62vqVLaQmPtYT18tbk2i7fY6eRnYBrsrJZ",
+        "8d98e24f45c472b2a04390fa80acc09ce2ce7d1ce041489fe5d9e8d89bdf6b2d",
        {
            "isCompressed": false,
            "isPrivkey": true,
@ -117,8 +117,8 @@
        }
    ],
    [
-        "XEWofkt9DGbzoiLRCphSp5ceo4nLkxVb1wigc4UZFdYbT4DkfY5G",
-        "6049f2a615758eb714107fd3a3a89c21e66d1df8d3fd2b77541b420b2b626e54",
+        "XHNgkfosQamJ6M4bptMJPAMpqdeRj5mh3DWRy7fmhYcBRhHez15H",
+        "b59fcc3195c2d5e3ccb19956b0d513154cff959ec3acf9bb6004670d728fee56",
        {
            "isCompressed": true,
            "isPrivkey": true,
@ -126,8 +126,8 @@
        }
    ],
    [
-        "93WeoSgWhXS7exnmfJF2xWzzwu6WsWXbC7oBmUpRj4RdCuvAocR",
-        "fdb554053cdd0f656c850b559e7c035aac7ec3843b50715684f6bbefa960d768",
+        "93WCLruvEegkBVYc74utyt8xvt4TxunX1kHryCQtc3RCJ724Uuq",
+        "fcac2955e7b3e3c28a1e069b177089574defb34741e9079a977e760fb36cdec6",
        {
            "isCompressed": false,
            "isPrivkey": true,
@ -135,8 +135,8 @@
        }
    ],
    [
-        "cQU9TGJ1ANQGVXFZxjm3hgUiys63eCP9t8yGW7ApSRygdGjiRUwd",
-        "5623d767f5e74e7c7bbd110aab9f37fc2d1c3322953b89f2a8525befa8c25e88",
+        "cQqbUpKkaBKG1TAyXFh6xGKEfQMZChtu6Tv1NsZMHHwTXja6QnWv",
+        "612c8e6ef60e6d036e4cde5882e55978c84b08825a246098f1e8bf1e068f43a4",
        {
            "isCompressed": true,
            "isPrivkey": true,
@ -144,8 +144,8 @@
        }
    ],
    [
-        "XvqtyVrgvcScxDBYTAGyEN7vzsiLN1fDJP",
-        "dd18e1dc6258b1819c6040157c68f0c1473a275b",
+        "XkMbn4X26GbXrb5U8t1dP2miqvwJCqk6XD",
+        "6a0d9f3c2bcbf03ceba283fe3feeaf8eb92f7acc",
        {
            "addrType": "pubkey",
            "isPrivkey": false,
@ -153,8 +153,8 @@
        }
    ],
    [
-        "7gjBLrm3o79JX5c31RVkfauD8DnXfRGL2B",
-        "9d12c837ab20387cdddcb0aa887c9c00b44a1b70",
+        "7bNrQPXbcGnbe3K2dUnQD9bXawugSgX8cX",
+        "6262063c2a4a0a638062aaff356d79c35600a821",
        {
            "addrType": "script",
            "isPrivkey": false,
@ -162,8 +162,8 @@
        }
    ],
    [
-        "yKuyYjHTYNiphkkZ4Y7YbFfbpcCy2imwon",
-        "fb8fa4973eed8075c0c410ce27b9fa90880c8bc2",
+        "yXU6wzQ9mU8VmSppe4BLTJ6wuCgeAddPkG",
+        "7a4c83f2194c3d4b8d2557659807e31fe549e1f3",
        {
            "addrType": "pubkey",
            "isPrivkey": false,
@ -171,8 +171,8 @@
        }
    ],
    [
-        "8ftqudu9xnxe7tfgC5nDikKvhSdv7Tcs7f",
-        "1025e3535bfac128f08eeb78bf15285f5be38856",
+        "8kvSTstYGkxogEXxJ3ALCD4bwMSnVV2uR8",
+        "474bc756e41243d2864aa4aae4e962edb3b4b514",
        {
            "addrType": "script",
            "isPrivkey": false,
@ -180,8 +180,8 @@
        }
    ],
    [
-        "7rX6fLM55mk5H1jYJArdN5UcmwHJvVARWwybR7G2F6oyv5TLfMq",
-        "7fb0ac3c88d2f2699723b5cced94bc5194816bede1bf35fa12ee862457fa07c6",
+        "7s4u8NofVVzDz4uz3FELHRSLccn9G6AaTpnkEUeRCHmmaFeysZE",
+        "c7e604df1cca9e700fd023b42495902d1c8eca2642df42543451b3124d9c7279",
        {
            "isCompressed": false,
            "isPrivkey": true,
@ -189,8 +189,8 @@
        }
    ],
    [
-        "XCcWrv6qYgDe9nias5EwSNsWQF8jAVJBnp1yJ65Xg9cuikDGSRtr",
-        "278d36b11df76a5369a3feb2bddd9cb9fcc699d92ccb49fd1de7a1d6c3a2bec0",
+        "XEPuZVWCUjRFeoW9hKg4DB9QsZhqojT9uqFt3Mu2UVc61GkRwWdH",
+        "5cbd7421d9fbe6b3bc5b684da2054091da8a64b2a3ad25ab7960d452fd05b3ff",
        {
            "isCompressed": true,
            "isPrivkey": true,
@ -198,8 +198,8 @@
        }
    ],
    [
-        "931dGpssEosvP2yemtY1nuRHgbbQUfLijSoN62bYAWk9AyEkv3k",
-        "bbccea5b578416fa5e59188ccbfe624172ed10840cb0e7171e99ebdd23df48d2",
+        "92bAGbFfnYyk78iHJ7PdhV7TsJe2scVFpQ3BjWkrcfBEFBQGefV",
+        "843f9361a729052d69193c9f47b09383416881f68188bd1139fee97bc6ec7d92",
        {
            "isCompressed": false,
            "isPrivkey": true,
@ -207,8 +207,8 @@
        }
    ],
    [
-        "cVNXtUJVyejHXuzY2LwL2KzSRSgdsQxSDh9A9GCszw2o55Y311no",
-        "e870791765471ebc4b91f0a438031ae6db149352ec6aa8f5d3f132d0f7059548",
+        "cRFHttGojDviBmDokZys6C2RHYrtwiyyWtcQmT7gWSeRbFQY4e49",
+        "6d5d556d5843e6c550b83f4a33be4dd3bdd5d143c07052a0cdf1f1b351d9cd2f",
        {
            "isCompressed": true,
            "isPrivkey": true,
@ -216,8 +216,8 @@
        }
    ],
    [
-        "XtmAS3bRy7YC1gqH2ENc3zd3c1MhGMDgjR",
-        "c643744f923eff771d090e1421bf5879ede1c80e",
+        "XdsK6sSz3L4zLJCdyPRukR6AR2LythNSqi",
+        "22e34cda0ba9e2affb620720ae8a7797567da639",
        {
            "addrType": "pubkey",
            "isPrivkey": false,
@ -225,8 +225,8 @@
        }
    ],
    [
-        "7nxhB9478J7GV8TwYKoF9C9cDvZW8MZmNP",
-        "e171d8dfb8b1814269ed014d0e53509d271676b3",
+        "7bofzFHNeodW6iJGv6bzkejVHDE12DPXm1",
+        "6713ba75a430dc678a402012a8fdc40fcf3c2ba5",
        {
            "addrType": "script",
            "isPrivkey": false,
@ -234,8 +234,8 @@
        }
    ],
    [
-        "y4EvvxWumgj6Hp17aTxZFNdryMwCfNbQ1Z",
-        "4fa3596c4419587dcab29f4399834cf66b59f1c6",
+        "ybtBPfTFkCUWFBzGmGnDQgyfWB5N74LBwC",
+        "aabab5cd40c1cc70d254e8616bf75edc2eaf4bc1",
        {
            "addrType": "pubkey",
            "isPrivkey": false,
@ -243,8 +243,8 @@
        }
    ],
    [
-        "8neynXqwBtPfXEvo8dSGrYeA56oW9DggfN",
-        "5a4f8554e2c98aaf3e9dd5614af171420b79bb66",
+        "8oDjDp3wqAdWLEuT4LXPo7N8ZHWoJLdMU8",
+        "6081170c074531062628484693ed4e97b3963670",
        {
            "addrType": "script",
            "isPrivkey": false,
@ -252,8 +252,8 @@
        }
    ],
    [
-        "7sAwTA7eZH3odQTswqSF2h6NKXD8dfYwrkJn6x1GyDoUBEMsokh",
-        "d59cfbfcfe10a9d87ff9fa57c6f87b550910f15c5abc15f90917424b5798e0f4",
+        "7r5ffXenTyRA9rXf3Mgji4fh33AFYuMm8eSaKpRMnimgQV1Z4KV",
+        "45f22c0ff5e0f588f710377c9c940ca11bfa920a2b5cc5ff4b6f115e8d2bc2d1",
        {
            "isCompressed": false,
            "isPrivkey": true,
@ -261,8 +261,8 @@
        }
    ],
    [
-        "XKTrFhuCLeBBwScajCcsf1c8Efh7gARGDAqF2yapK696msf2qvp7",
-        "f3f498f509aeb55f18f7937a2c8a667eb28aa7a32eea7aa6b472bc11cedf6c44",
+        "XGYzT6mPs7L9z9S6Ryn8og8excfLtH7J5easZjDWH2kWfRBmoAgR",
+        "9d16918481c74120a5b60b684ac94a08ee341f1788575548b8c45098a88a9c29",
        {
            "isCompressed": true,
            "isPrivkey": true,
@ -270,8 +270,8 @@
        }
    ],
    [
-        "93Ue48g5BaVTMnuNRwP4yZjEioVQcWRh9kdMiqVgvYo9WhfECM4",
-        "f9234928a11f74574a7b7a234dcb4dec3156eb99c42ccc3c98f8ece31bfef13f",
+        "92j6ZafQ1DvMkuWvnY5FQdudW1WZGJQh8sPpoK6PEeoEfU7YLnv",
+        "9644a862c6e9e5d99c169e7bb7654bda044f2013ae3d46aa2b7d1b9c695109d8",
        {
            "isCompressed": false,
            "isPrivkey": true,
@ -279,8 +279,8 @@
        }
    ],
    [
-        "cRaD9vVXrpYm2RaY7ELvBUoSPaxr6n5ehQaJ1zZFnNcCm8RzgcjB",
-        "7718cb8d7201272a96151b168b88d72103cd0db8261b34bfc9bc8ade19e146ba",
+        "cSs1wg2Lm9AvQp8diEdfTp4kaaYpLm6GzFD3sxtCLkU2SJiD4qqk",
+        "9d948bbecb677f6fcba65d78964252e5892a491351ce1b6d0a69c5678de330fe",
        {
            "isCompressed": true,
            "isPrivkey": true,
@ -288,8 +288,8 @@
        }
    ],
    [
-        "Xh5WZWpDHgeQfeuP9QrKYYuT69kUMyH7GB",
-        "461a3c22d53c281b91b4b1cdb3a7885b74b4f814",
+        "XjmoGTCeDNDCGY6A4ed6d3VBdJmdsj17EJ",
+        "63a911fcd13311d90188b372b6f8ab7a853ef052",
        {
            "addrType": "pubkey",
            "isPrivkey": false,
@ -297,8 +297,8 @@
        }
    ],
    [
-        "7b62xrdjaCZzcna6NwKSNhGCrSo1pSSmCb",
-        "5f33c492eeec62ac479aead772bc33294425997e",
+        "7gtFVBDLHVg4AVBJpneR9fNr9SyEZKaeic",
+        "9ec9fc088ce0a02386c787227e699e50256edbae",
        {
            "addrType": "script",
            "isPrivkey": false,
@ -306,8 +306,8 @@
        }
    ],
    [
-        "yChwbMgKWbxnHus5erwQ95RDWYXnwLWnZT",
-        "ac8023a2ec4798c0082c6a101d49f76502f0346a",
+        "yd3pNG9y4V2R3wkjfzH5kvx3ULab6y6wf6",
+        "b785720a94fd55e6f1c738fc465918bdd4280464",
        {
            "addrType": "pubkey",
            "isPrivkey": false,
@ -315,8 +315,8 @@
        }
    ],
    [
-        "8pERNMZZTmYDNFbPQ381byEUMic2D2AmgN",
-        "6b9abaa57ea952a138e7c59c3a15ff14ba4cc893",
+        "8f3s8CPyf3fWEzsRo63SRzeJYVkVtqUHC4",
+        "06e2857a0b00f890ff8d8a5cd43efebbdf48214c",
        {
            "addrType": "script",
            "isPrivkey": false,
@ -324,8 +324,8 @@
        }
    ],
    [
-        "7rJFQjS5eaQ25CH9FX4oMFw55FvPV8NsppeLezGJKdyxWHbLY4A",
-        "6283b79109be1e93ea62fc8a24b7c42fb9f5ed9b424ad4b4816044478c8ce8ac",
+        "7rz61M9gL9gtoZWJBbF2m34ajNfAaPmJrRyCBxuSn6D2VFETrfE",
+        "bcf8a68ca0454f7a356a9c3e30d8f25ae30d9218a58861bea11b4ccfbdce83fa",
        {
            "isCompressed": false,
            "isPrivkey": true,
@ -333,8 +333,8 @@
        }
    ],
    [
-        "XFHPpA6SUeAzxeGJr47WSMyTRp6H9Mr1rg4NRaYXKW9xpcHGHsBs",
-        "773a1b268aa742270e4ffc004844bbef3498bbc456ffaabfbb0a8a2bb637d256",
+        "XJ6a2G4a1ieDujR12rZy5T3tcRmNj5AfBmEw7jJrrT7XxBbjcWc5",
+        "cb2bbfe7aba4c95555da06409432cae7fd3a7ff59471c0e33744c27d49729340",
        {
            "isCompressed": true,
            "isPrivkey": true,
@ -342,8 +342,8 @@
        }
    ],
    [
-        "93Ex6wWmXkzm8w7QGcp5VcZcJmxwto2kewmoumRzungL4SwFV1o",
-        "da0e41eb551c7529863ad58956bc6d87a86adccdc6b735cd8bcc6cdf1c579607",
+        "91czfGPDq43RjAAcMFJh8kRqiEA5apW3R1S5xYY44EgUyNUFAPn",
+        "04b7a1a49323625e107fa24634de2d41ddb693320fb3aabfd471b6ccc2120af2",
        {
            "isCompressed": false,
            "isPrivkey": true,
@ -351,8 +351,8 @@
        }
    ],
    [
-        "cQMqQZ6mVYCUDFnASnKJyGubPPe3YQKdMoSY5vJJarWoEAPQDZ33",
-        "52e4b0038aa0063109bc777e73aae66056b59ced07f65cc7398a6ec6b06bc338",
+        "cULWxgtMoehad4qqafyxrd5nEgtriXbFwQNc9MYFFWj16yagKxfB",
+        "c9909a0cf712be81d4f88526658f1fb46333439fd2ec2e58ceb9f469ee69b303",
        {
            "isCompressed": true,
            "isPrivkey": true,
@ -360,8 +360,8 @@
        }
    ],
    [
-        "XduC2ErEGuCpLDJGvRVug2pR86BDZTVjzy",
-        "233e38e009bc4eed6f5a2b3f7b36835151f3ee5b",
+        "XuuUgm1e17hRV9pUKDzf1Xf6pBA35XaNsJ",
+        "d2ce252de1e1dd9d1205a9672b274f488d943c92",
        {
            "addrType": "pubkey",
            "isPrivkey": false,
@ -369,8 +369,8 @@
        }
    ],
    [
-        "7VK1d3hg43WTrwm9RuYuXPPdA4V61Pno44",
-        "1fd74d01c9a0fc617614d8d32704a0987b7b538a",
+        "7gG3an3hmKQasE36RWzhfhnpy5y6M5zZaP",
+        "97f112c9c50ac814a953202f485eedfd2cf856b5",
        {
            "addrType": "script",
            "isPrivkey": false,
@ -378,8 +378,8 @@
        }
    ],
    [
-        "yCBzUeRfxV5qHGwmX6etn8tdBmrRgfz1Mk",
-        "a6d6116aaed714960c16321cdd18991b96aed4e4",
+        "ya2zvp6VqHwHuNzRYfVKScpFwAEaiVfwrb",
+        "967577dd6bb09cd009d81be910b37ead7ad31e1a",
        {
            "addrType": "pubkey",
            "isPrivkey": false,
@ -387,8 +387,8 @@
        }
    ],
    [
-        "8gsd9bJ1pNSjg4YTtYae6FjUwzj6M8af3i",
-        "1ae2f261de810092a1e7067b53e76fa6e2a7a4d7",
+        "8qYkoymbuRbcZPfSVw98jQG9Te3333o25Q",
+        "7a0a9245e83625c635c9b1db175338d2e22e1976",
        {
            "addrType": "script",
            "isPrivkey": false,
@ -396,8 +396,8 @@
        }
    ],
    [
-        "7rWcwj8atNtJF3fctp1Jh149pjqTv72JHQZhbpmRsbZHPn4EgSx",
-        "7e9ae345c11780fce7e00ce4fd4e496a302e1c46e1ef49fed93c8ca3db988b9c",
+        "7rLo1znMUU7gZQy66JvrHkvozumpxWVDqcVvENUnKDyoGG7G7Fv",
+        "684b0d908dfa54a9a9ea86f0b95b8a570ffe6c705b21c98f8753f0e152234cc7",
        {
            "isCompressed": false,
            "isPrivkey": true,
@ -405,8 +405,8 @@
        }
    ],
    [
-        "XGPguKMh41H43gMRDSBmNgsfr1FfSWCHPfwKPkUxpbAYEsNYq3sN",
-        "984d756f7b7c535893ab91696e4b7342c11a38cf0d82a0325d6b7edc9ab85500",
+        "XKWfDoYj2WAHFohAkN1usLZ7qp7pTDJrSZZq6mygDwcYfXufZUcW",
+        "f566a26ae4e40f6dc430c8b554fa9f9a9dcb2241c5d6e91bd6974b8efbd13604",
        {
            "isCompressed": true,
            "isPrivkey": true,
@ -414,8 +414,8 @@
        }
    ],
    [
-        "93HNkH247Ri8rqoqNXyt1ccnPzHojKoW6t4EFpBxnTGJuc6Axyc",
-        "df8fcc07db2b4ae3b2e770774b03af73bc25b7492ca08d35deb6ad5e0e4c0928",
+        "924PDowxE6eFweoqHp1wJbPhmmtw4wQWLNXf9PSgGUpRS2Qb45S",
+        "3e5db91a1ddfc8ddd7b70c1f42dd17956a134da974a69ac49b86ec6dff40c6c1",
        {
            "isCompressed": false,
            "isPrivkey": true,
@ -423,8 +423,8 @@
        }
    ],
    [
-        "cNgycjw37GnpoTHdJd7tAnaYhooFhgHqMgbZEVpj7GA13YezNYKS",
-        "2110cef227230cdc169c3281f9d859deb0d75aa782411bc1d215fbcafaec6178",
+        "cNACCSjtqhYrLCdoFjfPUULdhPjhsA5GfgoqZHomWCUCpM9FMeJj",
+        "113acbdd52394bce786759896bc0c856bb8250f73dbc534dbc4abb7e9ff67307",
        {
            "isCompressed": true,
            "isPrivkey": true,
@ -432,8 +432,8 @@
        }
    ],
    [
-        "XfACS2EQP939TQ359kdA3D3XiQCZ7c19TR",
-        "310cedfe8a9e608b30fbffbe6ae0b8c0ce2f280c",
+        "XetExvaUvtrzqUaMgXBzxa4ZZsebdzGxha",
+        "2e0863783ae131b41bcac197738de589881a59c9",
        {
            "addrType": "pubkey",
            "isPrivkey": false,
@ -441,8 +441,8 @@
        }
    ],
    [
-        "7c5VUH4UsERFPEzgrVYQTfcCz34mpenhNE",
-        "6a119ad68dfa96d47e60bee682eb035e04a672b1",
+        "7mkzXHgVaVqFF8bvKVpRrL6LeS6tLPBHw8",
+        "d44335f13c8d26c9ba5106b2d4f179ed5a650286",
        {
            "addrType": "script",
            "isPrivkey": false,
--- a/src/util.cpp
+++ b/src/util.cpp
@ -122,7 +122,7 @@ std::vector<CAmount> darkSendDenominations;
 string strBudgetMode = "";

 const char * const BITCOIN_CONF_FILENAME = "dash.conf";
-const char * const BITCOIN_PID_FILENAME = "dash.pid";
+const char * const BITCOIN_PID_FILENAME = "dashd.pid";

 map<string, string> mapArgs;
 map<string, vector<string> > mapMultiArgs;