Litecoin: Fix base58 and block encoding tests

contrib/testgen/gen_base58_test_vectors.py

@@ -18,11 +18,11 @@ import random
 from binascii import b2a_hex
 
 # key types
-PUBKEY_ADDRESS = 0
+PUBKEY_ADDRESS = 48
 SCRIPT_ADDRESS = 5
 PUBKEY_ADDRESS_TEST = 111
 SCRIPT_ADDRESS_TEST = 196
-PRIVKEY = 128
+PRIVKEY = 176
 PRIVKEY_TEST = 239
 
 metadata_keys = ['isPrivkey', 'isTestnet', 'addrType', 'isCompressed']

src/test/blockencodings_tests.cpp

@@ -27,9 +27,9 @@ static CBlock BuildBlockTestCase() {
 
     block.vtx.resize(3);
     block.vtx[0] = tx;
-    block.nVersion = 42;
+    block.nVersion = 1;
     block.hashPrevBlock = GetRandHash();
-    block.nBits = 0x207fffff;
+    block.nBits = 0x1e0ffff0;
 
     tx.vin[0].prevout.hash = GetRandHash();
     tx.vin[0].prevout.n = 0;
@@ -45,7 +45,7 @@ static CBlock BuildBlockTestCase() {
     bool mutated;
     block.hashMerkleRoot = BlockMerkleRoot(block, &mutated);
     assert(!mutated);
-    while (!CheckProofOfWork(block.GetHash(), block.nBits, Params().GetConsensus())) ++block.nNonce;
+    while (!CheckProofOfWork(block.GetPoWHash(), block.nBits, Params().GetConsensus())) ++block.nNonce;
     return block;
 }
 
@@ -96,7 +96,7 @@ BOOST_AUTO_TEST_CASE(SimpleRoundTripTest)
         vtx_missing[0] = block.vtx[1];
         CBlock block3;
         BOOST_CHECK(partialBlock.FillBlock(block3, vtx_missing) == READ_STATUS_OK);
-        BOOST_CHECK_EQUAL(block.GetHash().ToString(), block3.GetHash().ToString());
+        BOOST_CHECK_EQUAL(block.GetPoWHash().ToString(), block3.GetPoWHash().ToString());
         BOOST_CHECK_EQUAL(block.hashMerkleRoot.ToString(), BlockMerkleRoot(block3, &mutated).ToString());
         BOOST_CHECK(!mutated);
     }
@@ -190,7 +190,7 @@ BOOST_AUTO_TEST_CASE(NonCoinbasePreforwardRTTest)
         vtx_missing[0] = block.vtx[0];
         CBlock block3;
         BOOST_CHECK(partialBlock.FillBlock(block3, vtx_missing) == READ_STATUS_OK);
-        BOOST_CHECK_EQUAL(block.GetHash().ToString(), block3.GetHash().ToString());
+        BOOST_CHECK_EQUAL(block.GetPoWHash().ToString(), block3.GetPoWHash().ToString());
         BOOST_CHECK_EQUAL(block.hashMerkleRoot.ToString(), BlockMerkleRoot(block3, &mutated).ToString());
         BOOST_CHECK(!mutated);
 
@@ -234,7 +234,7 @@ BOOST_AUTO_TEST_CASE(SufficientPreforwardRTTest)
         CBlock block2;
         std::vector<CTransaction> vtx_missing;
         BOOST_CHECK(partialBlock.FillBlock(block2, vtx_missing) == READ_STATUS_OK);
-        BOOST_CHECK_EQUAL(block.GetHash().ToString(), block2.GetHash().ToString());
+        BOOST_CHECK_EQUAL(block.GetPoWHash().ToString(), block2.GetPoWHash().ToString());
         bool mutated;
         BOOST_CHECK_EQUAL(block.hashMerkleRoot.ToString(), BlockMerkleRoot(block2, &mutated).ToString());
         BOOST_CHECK(!mutated);
@@ -256,14 +256,14 @@ BOOST_AUTO_TEST_CASE(EmptyBlockRoundTripTest)
     CBlock block;
     block.vtx.resize(1);
     block.vtx[0] = coinbase;
-    block.nVersion = 42;
+    block.nVersion = 1;
     block.hashPrevBlock = GetRandHash();
-    block.nBits = 0x207fffff;
+    block.nBits = 0x1e0ffff0;
 
     bool mutated;
     block.hashMerkleRoot = BlockMerkleRoot(block, &mutated);
     assert(!mutated);
-    while (!CheckProofOfWork(block.GetHash(), block.nBits, Params().GetConsensus())) ++block.nNonce;
+    while (!CheckProofOfWork(block.GetPoWHash(), block.nBits, Params().GetConsensus())) ++block.nNonce;
 
     // Test simple header round-trip with only coinbase
     {
@@ -282,7 +282,7 @@ BOOST_AUTO_TEST_CASE(EmptyBlockRoundTripTest)
         CBlock block2;
         std::vector<CTransaction> vtx_missing;
         BOOST_CHECK(partialBlock.FillBlock(block2, vtx_missing) == READ_STATUS_OK);
-        BOOST_CHECK_EQUAL(block.GetHash().ToString(), block2.GetHash().ToString());
+        BOOST_CHECK_EQUAL(block.GetPoWHash().ToString(), block2.GetPoWHash().ToString());
         bool mutated;
         BOOST_CHECK_EQUAL(block.hashMerkleRoot.ToString(), BlockMerkleRoot(block2, &mutated).ToString());
         BOOST_CHECK(!mutated);

src/test/data/base58_keys_invalid.json

@@ -6,147 +6,147 @@
         "x"
     ], 
     [
-        "37qgekLpCCHrQuSjvX3fs496FWTGsHFHizjJAs6NPcR47aefnnCWECAhHV6E3g4YN7u7Yuwod5Y"
+        "gZXdHjj9QCnNz5KnSqrXo2w8XghqUaYQmoFxMFaks8ZTLCcu2LtWmWFTNH3HdXQ46yJNha24p3T"
     ], 
     [
-        "dzb7VV1Ui55BARxv7ATxAtCUeJsANKovDGWFVgpTbhq9gvPqP3yv"
+        "6vFieKyF36RmFmvMaBVC9UJyQUm2b1xmYRhwJY97tv4p5LF68FF"
     ], 
     [
-        "MuNu7ZAEDFiHthiunm7dPjwKqrVNCM3mAz6rP9zFveQu14YA8CxExSJTHcVP9DErn6u84E6Ej7S"
+        "cQWGj8MhCtKbN26j23EPbuTPXZ5pyPKuYFFTBJLxQvCWQvJEMBEXW"
     ], 
     [
-        "rPpQpYknyNQ5AEHuY6H8ijJJrYc2nDKKk9jjmKEXsWzyAQcFGpDLU2Zvsmoi8JLR7hAwoy3RQWf"
+        "JBoefAMfPKWWaUYPo5edWZvvt1CCjaTCPcpLbtVPvmajm1RTZnLTxgtCxM9QVEf8if9u7Eg88fV1"
     ], 
     [
-        "4Uc3FmN6NQ6zLBK5QQBXRBUREaaHwCZYsGCueHauuDmJpZKn6jkEskMB2Zi2CNgtb5r6epWEFfUJq"
+        "TbxPvvXwEtvLwVJGsAzFHqskzVcHVkSYporbcVXfkUSsgFewgEsf"
     ], 
     [
-        "7aQgR5DFQ25vyXmqZAWmnVCjL3PkBcdVkBUpjrjMTcghHx3E8wb"
+        "2NUDYkhC7duHz13gNFxkwPdL1i2UATDDUAgYzE7Lhg3VkLxpCNkqThs6SR6zMiiNzQer6RZPURqf"
     ], 
     [
-        "17QpPprjeg69fW1DV8DcYYCKvWjYhXvWkov6MJ1iTTvMFj6weAqW7wybZeH57WTNxXVCRH4veVs"
+        "LgcotVvFQgGHygDWCkkyqVgyctGTe3pH4G"
     ], 
     [
-        "KxuACDviz8Xvpn1xAh9MfopySZNuyajYMZWz16Dv2mHHryznWUp3"
+        "5mfqm4pggSkz238Tju7k9UhnHpvuSNbYKckmXKV29KBwYFNdCZBMRfbaikVNyjvz3Mj2rHpYtF7wg"
     ], 
     [
-        "7nK3GSmqdXJQtdohvGfJ7KsSmn3TmGqExug49583bDAL91pVSGq5xS9SHoAYL3Wv3ijKTit65th"
+        "2U4ajn8ASmYcM42hDCGqi7rFCKuzZJ7nNWUgjeRtQdrz4kKVS7t6iG2QEE4xABbuoedzK4ya7u8B"
     ], 
     [
-        "cTivdBmq7bay3RFGEBBuNfMh2P1pDCgRYN2Wbxmgwr4ki3jNUL2va"
+        "2PGCEn9m7Vx1hcwjZzvm61UBfdm8rynZcNb"
     ], 
     [
-        "gjMV4vjNjyMrna4fsAr8bWxAbwtmMUBXJS3zL4NJt5qjozpbQLmAfK1uA3CquSqsZQMpoD1g2nk"
+        "2iKcv8HMvVtbHVEmfPPp52AMbjLQqgvbFYt"
     ], 
     [
-        "emXm1naBMoVzPjbk7xpeTVMFy4oDEe25UmoyGgKEB1gGWsK8kRGs"
+        "uDpgjm6HCQypJFQcVTmqv5qHioEhpsvZb1rsQX4ivTSwEPaZBp"
     ], 
     [
-        "7VThQnNRj1o3Zyvc7XHPRrjDf8j2oivPTeDXnRPYWeYGE4pXeRJDZgf28ppti5hsHWXS2GSobdqyo"
+        "4MxF1GvQDokfTcUm9BVfkAgnUdd1QaMo7jx7zrbvtg41YWJPecL"
     ], 
     [
-        "1G9u6oCVCPh2o8m3t55ACiYvG1y5BHewUkDSdiQarDcYXXhFHYdzMdYfUAhfxn5vNZBwpgUNpso"
+        "cQcyPZ6SYhkauD8rywrqVYhoib1qfLN7o8BMjsTFziCrmtppGuAw"
     ], 
     [
-        "31QQ7ZMLkScDiB4VyZjuptr7AEc9j1SjstF7pRoLhHTGkW4Q2y9XELobQmhhWxeRvqcukGd1XCq"
+        "5ngBnqMF5sDmGqaA42FXWuK1TornGT8irTU2jggc66NN6B9Pw7LH2qgYU7Msr6MLwNLxpnKxai2UV"
     ], 
     [
-        "DHqKSnpxa8ZdQyH8keAhvLTrfkyBMQxqngcQA5N8LQ9KVt25kmGN"
+        "cRSUJiBwxSUuswwFWRpk2fdBLK6KWHby3mgNyTRTpEMs7XJQ3xkbT"
     ], 
     [
-        "2LUHcJPbwLCy9GLH1qXmfmAwvadWw4bp4PCpDfduLqV17s6iDcy1imUwhQJhAoNoN1XNmweiJP4i"
+        "2KtV23FPhBCmkPYE43kXfJFm5bvzGaGxEj5"
     ], 
     [
-        "7USRzBXAnmck8fX9HmW7RAb4qt92VFX6soCnts9s74wxm4gguVhtG5of8fZGbNPJA83irHVY6bCos"
+        "25xmYrwhzccp4mK4x7DWJQ1KYqKcw6ckso4TraMXnRhn1aimYFPWEVFCgcfjxgWH9tBHziipv4isE"
     ], 
     [
-        "1DGezo7BfVebZxAbNT3XGujdeHyNNBF3vnficYoTSp4PfK2QaML9bHzAMxke3wdKdHYWmsMTJVu"
+        "5mqiJJe7ej7245THhVmyhFuNekhCJkotVpeuQvstRKDdW8wYUdqZFyPRqFPuen7AEaSu69AiEzYJp"
     ], 
     [
-        "2D12DqDZKwCxxkzs1ZATJWvgJGhQ4cFi3WrizQ5zLAyhN5HxuAJ1yMYaJp8GuYsTLLxTAz6otCfb"
+        "cN6EEuVvKaubeqiqVfDSyGA72UoZ8j8KPPRahQ57jxuyBMdaT19vR"
     ], 
     [
-        "8AFJzuTujXjw1Z6M3fWhQ1ujDW7zsV4ePeVjVo7D1egERqSW9nZ"
+        "wVwfGNa9BkYKseBzr7Vb458bZqTXMQL94V"
     ], 
     [
-        "163Q17qLbTCue8YY3AvjpUhotuaodLm2uqMhpYirsKjVqnxJRWTEoywMVY3NbBAHuhAJ2cF9GAZ"
+        "HfLPJ1eL8KGMhmHXSptJnSe4oBmXzMZ1PfvnKWewBdv9vhEiSVmevKjgwHffL9oM24YNAj5zAau"
     ], 
     [
-        "2MnmgiRH4eGLyLc9eAqStzk7dFgBjFtUCtu"
+        "Yk5B6MRro1YEay6CiX1Qj8qHY1R5o3c4EsXN644EAmjB2JMrgex5"
     ], 
     [
-        "461QQ2sYWxU7H2PV4oBwJGNch8XVTYYbZxU"
+        "LbW5JEaVWMLuMeiRhUQ3vmPzzzQ8sgXTFme"
     ], 
     [
-        "2UCtv53VttmQYkVU4VMtXB31REvQg4ABzs41AEKZ8UcB7DAfVzdkV9JDErwGwyj5AUHLkmgZeobs"
+        "FwVS4Xy2KUEypF76i9n5dkKvUM1YjbyRYJ"
     ], 
     [
-        "cSNjAsnhgtiFMi6MtfvgscMB2Cbhn2v1FUYfviJ1CdjfidvmeW6mn"
+        "T3Xe7hU6cgBveFinLV45SE8WHT1aJ6xEBXkyAqAtj4CqfKPb3ZEG"
     ], 
     [
-        "gmsow2Y6EWAFDFE1CE4Hd3Tpu2BvfmBfG1SXsuRARbnt1WjkZnFh1qGTiptWWbjsq2Q6qvpgJVj"
+        "M8LH9iCJBTzgSjTE5y8RtSLo3vabSv6RWjLr54pZHqXZCBJtkEbV"
     ], 
     [
-        "nksUKSkzS76v8EsSgozXGMoQFiCoCHzCVajFKAXqzK5on9ZJYVHMD5CKwgmX3S3c7M1U3xabUny"
+        "JKAsgoe5RRWDFruerwz2TVEifnGLkHkMiWkJzm9Y1KkDpMXW2nssdyXaHfQzPoxqvazpTEmRPe6"
     ], 
     [
-        "L3favK1UzFGgdzYBF2oBT5tbayCo4vtVBLJhg2iYuMeePxWG8SQc"
+        "7sTp4xUuNRta4baVDHf96n7fqba2NJ1DjAnYXYswEh1xm8hbZJF"
     ], 
     [
-        "7VxLxGGtYT6N99GdEfi6xz56xdQ8nP2dG1CavuXx7Rf2PrvNMTBNevjkfgs9JmkcGm6EXpj8ipyPZ"
+        "cUSxdRJwpEP8czXTLPSXPNYAB75xyFi7AYwc7azPvGqQLcyEb7jq"
     ], 
     [
-        "2mbZwFXF6cxShaCo2czTRB62WTx9LxhTtpP"
+        "JKSnxB43ogNNPW9F27d8amwPWimdRLG95EUCiSrFJybfxVFPUjBFZFdeGdjzBygXCi7rinvS6Rz"
     ], 
     [
-        "dB7cwYdcPSgiyAwKWL3JwCVwSk6epU2txw"
+        "tJgWcJ8FqGWWuX6DGeMxnCKjfhm2osTu6Q"
     ], 
     [
-        "HPhFUhUAh8ZQQisH8QQWafAxtQYju3SFTX"
+        "2UDnhZGfuHzAKd4HSo99ALrVax5TgKxzALJR1Ct36ibrZqXsnwRBsVvKneDYWxiQjcpnQ3NWK2as"
     ], 
     [
-        "4ctAH6AkHzq5ioiM1m9T3E2hiYEev5mTsB"
+        "JCK4Kx3L6ZbHkSJwPYJPijK6SNgQDutbtE4XAxgTFgFWmFx1w97XczfKptjZKn3THosoZ2k81mb"
     ], 
     [
-        "Hn1uFi4dNexWrqARpjMqgT6cX1UsNPuV3cHdGg9ExyXw8HTKadbktRDtdeVmY3M1BxJStiL4vjJ"
+        "AbnXu1Rgaemzvbg1tVgTBjah1owubWPkFZ"
     ], 
     [
-        "Sq3fDbvutABmnAHHExJDgPLQn44KnNC7UsXuT7KZecpaYDMU9Txs"
+        "928wcz8UaXY3tHmeseuFAfYLNSBjrs8jdxKRGkJGk5Wyx2CvhmkPzTrPKporxAKqLs9bAh29Btb"
     ], 
     [
-        "6TqWyrqdgUEYDQU1aChMuFMMEimHX44qHFzCUgGfqxGgZNMUVWJ"
+        "Qp7EyuWueg4cazBtJW3uYKwLmL1uR3PkgDVoBsGSMZWu1njcRRJ"
     ], 
     [
-        "giqJo7oWqFxNKWyrgcBxAVHXnjJ1t6cGoEffce5Y1y7u649Noj5wJ4mmiUAKEVVrYAGg2KPB3Y4"
+        "6R9r5RHQdN6Fgk9K2PHSx1sXKpk8QskdyzXtCSNAfJmehY9DD1Dd"
     ], 
     [
-        "cNzHY5e8vcmM3QVJUcjCyiKMYfeYvyueq5qCMV3kqcySoLyGLYUK"
+        "271T9hGPSeP9QRTb7g5tRZYT7ADbJhivFb6"
     ], 
     [
-        "37uTe568EYc9WLoHEd9jXEvUiWbq5LFLscNyqvAzLU5vBArUJA6eydkLmnMwJDjkL5kXc2VK7ig"
+        "2x7WjATScgcSHNpGMGz8TKKS2g2E7Qkg9x3CMuGxxCDCHy1rQr1RFEjdjP6Lw6qksGJLcp7i6U6"
     ], 
     [
-        "EsYbG4tWWWY45G31nox838qNdzksbPySWc"
+        "2jwUaPdB93pxW5dJpoGjq3RCKyBEqTqfcq3"
     ], 
     [
-        "nbuzhfwMoNzA3PaFnyLcRxE9bTJPDkjZ6Rf6Y6o2ckXZfzZzXBT"
+        "7VkJFJwgtTaqCXks8JrxuJEkEoDGGUrGQBBUp2SVwb93UWAQ6d3kYK8y3u1CQKZi6f8fZWCoDpr3pP"
     ], 
     [
-        "cQN9PoxZeCWK1x56xnz6QYAsvR11XAce3Ehp3gMUdfSQ53Y2mPzx"
+        "T4UVQQSBJdRVkNvgNxkmcP9mVtWoBLWqmzZo1T8Z9GDNPYj6rV1s"
     ], 
     [
-        "1Gm3N3rkef6iMbx4voBzaxtXcmmiMTqZPhcuAepRzYUJQW4qRpEnHvMojzof42hjFRf8PE2jPde"
+        "2UA3wL1KGhNh2UR2HYRPVgJ9Dx32qEGapePi8wp1SZ9UmTCHV5fkudMA2CZ78t7KKDAQWtNB3PFc"
     ], 
     [
-        "2TAq2tuN6x6m233bpT7yqdYQPELdTDJn1eU"
+        "gcBstMZS9mKRXeGiYQJ5vG2ukiEKRirxskCEqZ6rmFwWuh2kyNxwqsd6pnduEdV7Zvvkgcu9VKt"
     ], 
     [
-        "ntEtnnGhqPii4joABvBtSEJG6BxjT2tUZqE8PcVYgk3RHpgxgHDCQxNbLJf7ardf1dDk2oCQ7Cf"
+        "5mqKtSZGj3bHtMgmSDbt9Qmp9NnQ8ECnYQ8b54eJKERw5stGCTZ42ECVxeTWU1JTC9o8Tewe4WxEW"
     ], 
     [
-        "Ky1YjoZNgQ196HJV3HpdkecfhRBmRZdMJk89Hi5KGfpfPwS2bUbfd"
+        "31q9AKvsdwuSP2znBRMLugqALxQ1aSfAqWbT1gyS1tsjFFj2ZZMSGAEE1kyFsC6H6fy7v6yTTtb"
     ], 
     [
-        "2A1q1YsMZowabbvta7kTy2Fd6qN4r5ZCeG3qLpvZBMzCixMUdkN2Y4dHB1wPsZAeVXUGD83MfRED"
+        "35YhSwzbJMECakq9H1SiGcQmMyckD5A6nDkk2tMMFCbyVjpL7aV"
     ]
 ]

src/test/data/base58_keys_valid.json

@@ -1,7 +1,7 @@
 [
     [
-        "1AGNa15ZQXAZUgFiqJ2i7Z2DPU2J6hW62i", 
-        "65a16059864a2fdbc7c99a4723a8395bc6f188eb", 
+        "LdwLvykqj2nUH3MWcut6mtjHxVxVFC7st5", 
+        "cd463dbc6f8076c7021f2766b36ea7e19c5c9e2e", 
         {
             "addrType": "pubkey", 
             "isPrivkey": false, 
@@ -9,8 +9,8 @@
         }
     ], 
     [
-        "3CMNFxN1oHBc4R1EpboAL5yzHGgE611Xou", 
-        "74f209f6ea907e2ea48f74fae05782ae8a665257", 
+        "3QiEMZmknJkHxz9q2VjTCT1tvUicLvBpdZ", 
+        "fc85afab90ad569ed50fe8771d70aff8a7eb788d", 
         {
             "addrType": "script", 
             "isPrivkey": false, 
@@ -18,8 +18,8 @@
         }
     ], 
     [
-        "mo9ncXisMeAoXwqcV5EWuyncbmCcQN4rVs", 
-        "53c0307d6851aa0ce7825ba883c6bd9ad242b486", 
+        "mmCKZS7toE69QgXNs1JZcjW6LFj8LfUbz6", 
+        "3e4a9a4a79dcad8800b6cfcdf102bf98064b7454", 
         {
             "addrType": "pubkey", 
             "isPrivkey": false, 
@@ -27,8 +27,8 @@
         }
     ], 
     [
-        "2N2JD6wb56AfK4tfmM6PwdVmoYk2dCKf4Br", 
-        "6349a418fc4578d10a372b54b45c280cc8c4382f", 
+        "2N5X5FB9Cro2qW4Dww1pEKYXMhQt8PK6KHM", 
+        "86a0ddc5ce64594f0b84d96596657e1f5e0af7f6", 
         {
             "addrType": "script", 
             "isPrivkey": false, 
@@ -36,8 +36,8 @@
         }
     ], 
     [
-        "5Kd3NBUAdUnhyzenEwVLy9pBKxSwXvE9FMPyR4UKZvpe6E3AgLr", 
-        "eddbdc1168f1daeadbd3e44c1e3f8f5a284c2029f78ad26af98583a499de5b19", 
+        "6uyyEQaLajn2bVG4DQ9LkwKqdTLWv5fxzSgBBwFMhZnY6SHamHF", 
+        "716bbb0c59dc95f658b169b09c9ada6b106d79ef637dc0a1361aea83b67f3281", 
         {
             "isCompressed": false, 
             "isPrivkey": true, 
@@ -45,8 +45,8 @@
         }
     ], 
     [
-        "Kz6UJmQACJmLtaQj5A3JAge4kVTNQ8gbvXuwbmCj7bsaabudb3RD", 
-        "55c9bccb9ed68446d1b75273bbce89d7fe013a8acd1625514420fb2aca1a21c4", 
+        "T92ej9rAJ2HEKBtXKpcQEB88KMjBUW43uVxzwgAAYmm97CbDfuB2", 
+        "b257a0d8b63aac2cbac1f6b57c73ee6313650a000ac895456f633e05e1f276b1", 
         {
             "isCompressed": true, 
             "isPrivkey": true, 
@@ -54,8 +54,8 @@
         }
     ], 
     [
-        "9213qJab2HNEpMpYNBa7wHGFKKbkDn24jpANDs2huN3yi4J11ko", 
-        "36cb93b9ab1bdabf7fb9f2c04f1b9cc879933530ae7842398eef5a63a56800c2", 
+        "93UCtAocH3kKPwoqEcjNGR1qi9MLkhQio2vMjWCMdEsBNwTKszg", 
+        "f8270343a5cc4936c0f304520700b9a9f443dddeb5b2bfa9ef8414d126e9835b", 
         {
             "isCompressed": false, 
             "isPrivkey": true, 
@@ -63,8 +63,8 @@
         }
     ], 
     [
-        "cTpB4YiyKiBcPxnefsDpbnDxFDffjqJob8wGCEDXxgQ7zQoMXJdH", 
-        "b9f4892c9e8282028fea1d2667c4dc5213564d41fc5783896a0d843fc15089f3", 
+        "cU3MMfRXJpVuVXKdkqn1x8cqEHz4AfyBmVFj7CvBUdApAZYo6Lj8", 
+        "c0bbf61af02667b9a7c172c2d4bfa64ac9d4553f7ae19fb295c06e77cc799296", 
         {
             "isCompressed": true, 
             "isPrivkey": true, 
@@ -72,8 +72,8 @@
         }
     ], 
     [
-        "1Ax4gZtb7gAit2TivwejZHYtNNLT18PUXJ", 
-        "6d23156cbbdcc82a5a47eee4c2c7c583c18b6bf4", 
+        "LWZR9ybwmT8vSXP6tmrBX4b6nE9o94AjQG", 
+        "7c57bc50a38d8377ad55260f29f2c8619846ef08", 
         {
             "addrType": "pubkey", 
             "isPrivkey": false, 
@@ -81,8 +81,8 @@
         }
     ], 
     [
-        "3QjYXhTkvuj8qPaXHTTWb5wjXhdsLAAWVy", 
-        "fcc5460dd6e2487c7d75b1963625da0e8f4c5975", 
+        "32wfwbXojzQN9vYFQGquFTt7sqKnB8Phyz", 
+        "0dbdaf6928107d60299f5069367c4cf07fa9b6e5", 
         {
             "addrType": "script", 
             "isPrivkey": false, 
@@ -90,8 +90,8 @@
         }
     ], 
     [
-        "n3ZddxzLvAY9o7184TB4c6FJasAybsw4HZ", 
-        "f1d470f9b02370fdec2e6b708b08ac431bf7a5f7", 
+        "mvJg85FLYqN7xAcZeFZRVg7pMbJ53BqKmy", 
+        "a237653c5ae7e18e840d6463d380701ce3ba5035", 
         {
             "addrType": "pubkey", 
             "isPrivkey": false, 
@@ -99,8 +99,8 @@
         }
     ], 
     [
-        "2NBFNJTktNa7GZusGbDbGKRZTxdK9VVez3n", 
-        "c579342c2c4c9220205e2cdc285617040c924a0a", 
+        "2NCGcqUHf4q4vE2MZD6bnaVzFUSKPM4WCDX", 
+        "d0ade0e231a81794ed1baa081604de53ddd8b083", 
         {
             "addrType": "script", 
             "isPrivkey": false, 
@@ -108,8 +108,8 @@
         }
     ], 
     [
-        "5K494XZwps2bGyeL71pWid4noiSNA2cfCibrvRWqcHSptoFn7rc", 
-        "a326b95ebae30164217d7a7f57d72ab2b54e3be64928a19da0210b9568d4015e", 
+        "6w3nZ8BsJLuJwe42QpFAwCZC9EFz4e2k1ewhRT9ab2poUv8KSu7", 
+        "fdc80a3b189a9d64a1fb8e5a9905d92922f77e135a235a06046147f10d4f09be", 
         {
             "isCompressed": false, 
             "isPrivkey": true, 
@@ -117,8 +117,8 @@
         }
     ], 
     [
-        "L1RrrnXkcKut5DEMwtDthjwRcTTwED36thyL1DebVrKuwvohjMNi", 
-        "7d998b45c219a1e38e99e7cbd312ef67f77a455a9b50c730c27f02c6f730dfb4", 
+        "T5EAeSR4zfUGvNiA4iCVPpV8Gz6ZUGAT94bsBqTv3kd81hNQCgzY", 
+        "40eab9b09d0469a7d9f84dae6bc5f98199e0b187fe4e74013cab437f9306ea00", 
         {
             "isCompressed": true, 
             "isPrivkey": true, 
@@ -126,8 +126,8 @@
         }
     ], 
     [
-        "93DVKyFYwSN6wEo3E2fCrFPUp17FtrtNi2Lf7n4G3garFb16CRj", 
-        "d6bca256b5abc5602ec2e1c121a08b0da2556587430bcf7e1898af2224885203", 
+        "92hDYngM3s5oLTK6Fsq1JKLLSgL5NdarzLm8r9ymzEfQzCB24cJ", 
+        "92001dd4cb225cdc0cf9fe2f824c807ffedd5235c9c0ca014949d0793fc66868", 
         {
             "isCompressed": false, 
             "isPrivkey": true, 
@@ -135,8 +135,8 @@
         }
     ], 
     [
-        "cTDVKtMGVYWTHCb1AFjmVbEbWjvKpKqKgMaR3QJxToMSQAhmCeTN", 
-        "a81ca4e8f90181ec4b61b6a7eb998af17b2cb04de8a03b504b9e34c4c61db7d9", 
+        "cQFFjska277aBhcbCaEdBSixz1BXEgnLoGYECu9mKJip3GBco8CL", 
+        "4f8210f4e6830d16fa8818d37fa9aed65664a20f3c41bfa5b502cdc8d1173dcb", 
         {
             "isCompressed": true, 
             "isPrivkey": true, 
@@ -144,8 +144,8 @@
         }
     ], 
     [
-        "1C5bSj1iEGUgSTbziymG7Cn18ENQuT36vv", 
-        "7987ccaa53d02c8873487ef919677cd3db7a6912", 
+        "LWkdEB9SHUfuBiTvZofK2LqYE4RTTtUcqi", 
+        "7e766382cb564021bcbc273e23569dcaed536ac6", 
         {
             "addrType": "pubkey", 
             "isPrivkey": false, 
@@ -153,8 +153,8 @@
         }
     ], 
     [
-        "3AnNxabYGoTxYiTEZwFEnerUoeFXK2Zoks", 
-        "63bcc565f9e68ee0189dd5cc67f1b0e5f02f45cb", 
+        "32cjrquumLmwSmBrNCbkU5UTUmtgetWqaL", 
+        "0a290d74c272ab52dec1a87ce88e75d29c94fe5a", 
         {
             "addrType": "script", 
             "isPrivkey": false, 
@@ -162,8 +162,8 @@
         }
     ], 
     [
-        "n3LnJXCqbPjghuVs8ph9CYsAe4Sh4j97wk", 
-        "ef66444b5b17f14e8fae6e7e19b045a78c54fd79", 
+        "mtei3esVvHhww4Rw9FYnMdTUTVvbpWhLfF", 
+        "901111ab28cf850a5b6846e94e8c0c4a505603a9", 
         {
             "addrType": "pubkey", 
             "isPrivkey": false, 
@@ -171,8 +171,8 @@
         }
     ], 
     [
-        "2NB72XtkjpnATMggui83aEtPawyyKvnbX2o", 
-        "c3e55fceceaa4391ed2a9677f4a4d34eacd021a0", 
+        "2N85CqWKWqfZ5Hc9qGXWmr5JKZzMqZCRDPM", 
+        "a2a4c41bd7150d28aa730140cebf7aa5341e2619", 
         {
             "addrType": "script", 
             "isPrivkey": false, 
@@ -180,8 +180,8 @@
         }
     ], 
     [
-        "5KaBW9vNtWNhc3ZEDyNCiXLPdVPHCikRxSBWwV9NrpLLa4LsXi9", 
-        "e75d936d56377f432f404aabb406601f892fd49da90eb6ac558a733c93b47252", 
+        "6vfWJ2KcJLjvXXx8aZNsLcQQnxTvXA38ci22BvhprTq5QpRS6k6", 
+        "cb30eec426333b2396d2362d4a380d7f6a4ae50a2701309a53f500fa389c166c", 
         {
             "isCompressed": false, 
             "isPrivkey": true, 
@@ -189,8 +189,8 @@
         }
     ], 
     [
-        "L1axzbSyynNYA8mCAhzxkipKkfHtAXYF4YQnhSKcLV8YXA874fgT", 
-        "8248bd0375f2f75d7e274ae544fb920f51784480866b102384190b1addfbaa5c", 
+        "T9xQZ1QYhGyYp7wzRQuLdfm1te8BwrnvWsibt6GXuK58Xoq2wryN", 
+        "cdff0814191533898aa1e6291f2c77e1a1945a732f70b8f09aadc637e9241e59", 
         {
             "isCompressed": true, 
             "isPrivkey": true, 
@@ -198,8 +198,8 @@
         }
     ], 
     [
-        "927CnUkUbasYtDwYwVn2j8GdTuACNnKkjZ1rpZd2yBB1CLcnXpo", 
-        "44c4f6a096eac5238291a94cc24c01e3b19b8d8cef72874a079e00a242237a52", 
+        "93C56vYXBM3XycR9M9pDNY333bTLT8KeqTpRXKSncruKpeuvfZ5", 
+        "d3849230c2d8bd3590708a8ff485deea6a73916a664255f95179282b146854fe", 
         {
             "isCompressed": false, 
             "isPrivkey": true, 
@@ -207,8 +207,8 @@
         }
     ], 
     [
-        "cUcfCMRjiQf85YMzzQEk9d1s5A4K7xL5SmBCLrezqXFuTVefyhY7", 
-        "d1de707020a9059d6d3abaf85e17967c6555151143db13dbb06db78df0f15c69", 
+        "cV7TW5gn8yJjrVy4mfYLDY1tfYN7o81tjeubEeqWxzyjdcU7Bv9F", 
+        "e0af129330504deb99dd989339b96d77ce3782a852b8e61a4367394505abc3e0", 
         {
             "isCompressed": true, 
             "isPrivkey": true, 
@@ -216,8 +216,8 @@
         }
     ], 
     [
-        "1Gqk4Tv79P91Cc1STQtU3s1W6277M2CVWu", 
-        "adc1cc2081a27206fae25792f28bbc55b831549d", 
+        "LVcGHJcTv1ctR6GLRXxR4SQSsycdmQ6pwZ", 
+        "71e9734a1283f2368bbd5a397d3c7a22610b2958", 
         {
             "addrType": "pubkey", 
             "isPrivkey": false, 
@@ -225,8 +225,8 @@
         }
     ], 
     [
-        "33vt8ViH5jsr115AGkW6cEmEz9MpvJSwDk", 
-        "188f91a931947eddd7432d6e614387e32b244709", 
+        "35CcFdsWEiXv4cuHjR8G54FYvrrDtm4WUm", 
+        "268118c8299cd5d8d3b9561caaf8c94d4bd1af44", 
         {
             "addrType": "script", 
             "isPrivkey": false, 
@@ -234,8 +234,8 @@
         }
     ], 
     [
-        "mhaMcBxNh5cqXm4aTQ6EcVbKtfL6LGyK2H", 
-        "1694f5bc1a7295b600f40018a618a6ea48eeb498", 
+        "myWBvpVEeY86YvJLb5kwH2iWbdXPGjTtZk", 
+        "c54d3aa920e78e56b72c0076d36e99bc87058397", 
         {
             "addrType": "pubkey", 
             "isPrivkey": false, 
@@ -243,8 +243,8 @@
         }
     ], 
     [
-        "2MxgPqX1iThW3oZVk9KoFcE5M4JpiETssVN", 
-        "3b9b3fd7a50d4f08d1a5b0f62f644fa7115ae2f3", 
+        "2N54Ew2vPqzA9PxG89rB1LM8MVfgePiCKqV", 
+        "818db8c869c5911d286d37088de9020cca43f702", 
         {
             "addrType": "script", 
             "isPrivkey": false, 
@@ -252,8 +252,8 @@
         }
     ], 
     [
-        "5HtH6GdcwCJA4ggWEL1B3jzBBUB8HPiBi9SBc5h9i4Wk4PSeApR", 
-        "091035445ef105fa1bb125eccfb1882f3fe69592265956ade751fd095033d8d0", 
+        "6uM1BTu9jkS6cMfFTtxzutmcNQYVpTome57XhxES6xKiiN7eM4v", 
+        "1d7bee7a5f4be2bcd945a4bdce28a479bb1afcf4d925d29de0124325bb55277d", 
         {
             "isCompressed": false, 
             "isPrivkey": true, 
@@ -261,8 +261,8 @@
         }
     ], 
     [
-        "L2xSYmMeVo3Zek3ZTsv9xUrXVAmrWxJ8Ua4cw8pkfbQhcEFhkXT8", 
-        "ab2b4bcdfc91d34dee0ae2a8c6b6668dadaeb3a88b9859743156f462325187af", 
+        "T6gDa2FYoYuCDpeJy8ePrdTVqxxvZ9H5nCqmdVCiRvLBWr1jymE9", 
+        "6c27d6190e8c49919b7c0919d1ca1b033c2b72b03234728d0b092087983f2544", 
         {
             "isCompressed": true, 
             "isPrivkey": true, 
@@ -270,8 +270,8 @@
         }
     ], 
     [
-        "92xFEve1Z9N8Z641KQQS7ByCSb8kGjsDzw6fAmjHN1LZGKQXyMq", 
-        "b4204389cef18bbe2b353623cbf93e8678fbc92a475b664ae98ed594e6cf0856", 
+        "91epwsbfDsLwAum2kYeibW9v3cyM9ALeHxFoR1wh7g8w58gihCj", 
+        "08e0d6cf0999a1427830e034b5281c8112d707d463da05d993d8b2b66985d91f", 
         {
             "isCompressed": false, 
             "isPrivkey": true, 
@@ -279,8 +279,8 @@
         }
     ], 
     [
-        "cVM65tdYu1YK37tNoAyGoJTR13VBYFva1vg9FLuPAsJijGvG6NEA", 
-        "e7b230133f1b5489843260236b06edca25f66adb1be455fbd38d4010d48faeef", 
+        "cTNjHC1zu7CifxVJ7g9V16LKVokd7D1XuEvqTtA88uwTsRUFXmWj", 
+        "acdd979c5e6eb9e619dfede5c7112af1057442c8799c1e1d85d7bf59892c923a", 
         {
             "isCompressed": true, 
             "isPrivkey": true, 
@@ -288,8 +288,8 @@
         }
     ], 
     [
-        "1JwMWBVLtiqtscbaRHai4pqHokhFCbtoB4", 
-        "c4c1b72491ede1eedaca00618407ee0b772cad0d", 
+        "LPD8ZwGjE4WmQ1EEnjZHrvofSyvGtbEWsH", 
+        "2bb8b0991f396d7f411c2227af00cc09d1ae0adf", 
         {
             "addrType": "pubkey", 
             "isPrivkey": false, 
@@ -297,8 +297,8 @@
         }
     ], 
     [
-        "3QCzvfL4ZRvmJFiWWBVwxfdaNBT8EtxB5y", 
-        "f6fe69bcb548a829cce4c57bf6fff8af3a5981f9", 
+        "35Bjf3NUkU6CNqUFB4HnkaYqN3VPMYwUED", 
+        "2656dc6ac50a5bdeb80348b9097af31e74698f44", 
         {
             "addrType": "script", 
             "isPrivkey": false, 
@@ -306,8 +306,8 @@
         }
     ], 
     [
-        "mizXiucXRCsEriQCHUkCqef9ph9qtPbZZ6", 
-        "261f83568a098a8638844bd7aeca039d5f2352c0", 
+        "mhv2Ti1xy9CsWoYgnEjehEunbhFiyFwLAp", 
+        "1a4d4bf230aabafd3a425770b8b98700bf06e370", 
         {
             "addrType": "pubkey", 
             "isPrivkey": false, 
@@ -315,8 +315,8 @@
         }
     ], 
     [
-        "2NEWDzHWwY5ZZp8CQWbB7ouNMLqCia6YRda", 
-        "e930e1834a4d234702773951d627cce82fbb5d2e", 
+        "2MwyQVPME89pGMxuX3fRwEgfXtgN1Y1wB7e", 
+        "33dabd6dfda94c9c1ef1654a3c3b1e0984a7aecf", 
         {
             "addrType": "script", 
             "isPrivkey": false, 
@@ -324,8 +324,8 @@
         }
     ], 
     [
-        "5KQmDryMNDcisTzRp3zEq9e4awRmJrEVU1j5vFRTKpRNYPqYrMg", 
-        "d1fab7ab7385ad26872237f1eb9789aa25cc986bacc695e07ac571d6cdac8bc0", 
+        "6uqTHcTC88EcZ8RQJDoH7dFfH46E8ZNpThbEKXCiQ12ag2GeHQ7", 
+        "5e15635f0be1e9717529fb2b65b0d430355f0f5db5811b47fc6545efbe082b23", 
         {
             "isCompressed": false, 
             "isPrivkey": true, 
@@ -333,8 +333,8 @@
         }
     ], 
     [
-        "L39Fy7AC2Hhj95gh3Yb2AU5YHh1mQSAHgpNixvm27poizcJyLtUi", 
-        "b0bbede33ef254e8376aceb1510253fc3550efd0fcf84dcd0c9998b288f166b3", 
+        "T34vLND26MHR4j1L8qsmojWcHtwYcmDdibMrsgo41SRYDDDdJzQe", 
+        "007c379af039e5472c784a1f41ccea5de8b8d6fde03139644f12294a5a4dc20d", 
         {
             "isCompressed": true, 
             "isPrivkey": true, 
@@ -342,8 +342,8 @@
         }
     ], 
     [
-        "91cTVUcgydqyZLgaANpf1fvL55FH53QMm4BsnCADVNYuWuqdVys", 
-        "037f4192c630f399d9271e26c575269b1d15be553ea1a7217f0cb8513cef41cb", 
+        "932VXf7wK3qQTGzudkeHWME2iweTTdyfyxQV4HqWLZsocbVQMgZ", 
+        "bdc494c6c492168886d7d19fe35c4e67c477f8e19bfe1b50a4b28a7f0910ac02", 
         {
             "isCompressed": false, 
             "isPrivkey": true, 
@@ -351,8 +351,8 @@
         }
     ], 
     [
-        "cQspfSzsgLeiJGB2u8vrAiWpCU4MxUT6JseWo2SjXy4Qbzn2fwDw", 
-        "6251e205e8ad508bab5596bee086ef16cd4b239e0cc0c5d7c4e6035441e7d5de", 
+        "cUNY2YHa2TZRNMKBjypnZ1kh7LnPzgBhapKQgqh8MXGGVQTqdqQS", 
+        "ca9a6a553f353255f2d91fde1718bd1f86c40c0b16f2aaccf8efefe242f5a7b6", 
         {
             "isCompressed": true, 
             "isPrivkey": true, 
@@ -360,8 +360,8 @@
         }
     ], 
     [
-        "19dcawoKcZdQz365WpXWMhX6QCUpR9SY4r", 
-        "5eadaf9bb7121f0f192561a5a62f5e5f54210292", 
+        "LPGeGFBPCVLHdGVD1i1oikzD92XZoTEVyh", 
+        "2c62b9d0c13b499167506863248f473416b18850", 
         {
             "addrType": "pubkey", 
             "isPrivkey": false, 
@@ -369,8 +369,8 @@
         }
     ], 
     [
-        "37Sp6Rv3y4kVd1nQ1JV5pfqXccHNyZm1x3", 
-        "3f210e7277c899c3a155cc1c90f4106cbddeec6e", 
+        "37h7vEB4v3jpqxKvX1qqJ5xZaqzLj7NPyN", 
+        "41d5c23a8188270b32d0afce2e11e4c3028afe6b", 
         {
             "addrType": "script", 
             "isPrivkey": false, 
@@ -378,8 +378,8 @@
         }
     ], 
     [
-        "myoqcgYiehufrsnnkqdqbp69dddVDMopJu", 
-        "c8a3c2a09a298592c3e180f02487cd91ba3400b5", 
+        "mhvk8vH4LaAgUBUJsU4UtL4KSWLavssToW", 
+        "1a701609b7d938f932d9517f965eb938ec45d067", 
         {
             "addrType": "pubkey", 
             "isPrivkey": false, 
@@ -387,8 +387,8 @@
         }
     ], 
     [
-        "2N7FuwuUuoTBrDFdrAZ9KxBmtqMLxce9i1C", 
-        "99b31df7c9068d1481b596578ddbb4d3bd90baeb", 
+        "2NBbbBFBoKk85mhvTJH4tc11U1zh4oqp7SG", 
+        "c94c4561b8ec99cddd540dedc67380c6b859ae00", 
         {
             "addrType": "script", 
             "isPrivkey": false, 
@@ -396,8 +396,8 @@
         }
     ], 
     [
-        "5KL6zEaMtPRXZKo1bbMq7JDjjo1bJuQcsgL33je3oY8uSJCR5b4", 
-        "c7666842503db6dc6ea061f092cfb9c388448629a6fe868d068c42a488b478ae", 
+        "6vQqYTYdTXyHLcAivoZ6N2pginHXkZj9DF8uu9rroj5jT32joQn", 
+        "a9e2a8019c11e6fd215f5c2ae834c7f07207723cac79b4e22744800c97212ac1", 
         {
             "isCompressed": false, 
             "isPrivkey": true, 
@@ -405,8 +405,8 @@
         }
     ], 
     [
-        "KwV9KAfwbwt51veZWNscRTeZs9CKpojyu1MsPnaKTF5kz69H1UN2", 
-        "07f0803fc5399e773555ab1e8939907e9badacc17ca129e67a2f5f2ff84351dd", 
+        "T7qqfYACj4bdqNMm9ZMMNtbaMXRzePBpL59msQiWw7i5JRuDLFVB", 
+        "8ef16edbbc8996a1be1c8a8d7de566a489a84484912060471158c0d20fcd42ba", 
         {
             "isCompressed": true, 
             "isPrivkey": true, 
@@ -414,8 +414,8 @@
         }
     ], 
     [
-        "93N87D6uxSBzwXvpokpzg8FFmfQPmvX4xHoWQe3pLdYpbiwT5YV", 
-        "ea577acfb5d1d14d3b7b195c321566f12f87d2b77ea3a53f68df7ebf8604a801", 
+        "91pvMZgXhzBit7xx2NrbgMiuVZJep46gTCdvFkQTijTA76Gzxfc", 
+        "1fcbd613ad91f41e062a66b11299585cff1639775df447360e74fbeea1e336c8", 
         {
             "isCompressed": false, 
             "isPrivkey": true, 
@@ -423,8 +423,8 @@
         }
     ], 
     [
-        "cMxXusSihaX58wpJ3tNuuUcZEQGt6DKJ1wEpxys88FFaQCYjku9h", 
-        "0b3b34f0958d8a268193a9814da92c3e8b58b4a4378a542863e34ac289cd830c", 
+        "cVWTK7AxBVgndSKS6Xs54XonuEh4NUhaHVtyzrWhHfQ2rLWdVrNy", 
+        "ec83a732c245dc6df111d6412aa1b2ed78072ae3ebaa499660ccb7f013adca8f", 
         {
             "isCompressed": true, 
             "isPrivkey": true, 
@@ -432,8 +432,8 @@
         }
     ], 
     [
-        "13p1ijLwsnrcuyqcTvJXkq2ASdXqcnEBLE", 
-        "1ed467017f043e91ed4c44b4e8dd674db211c4e6", 
+        "LhLu7S8qdG7YZR1GgSP8g4aqN8nXCRLkzX", 
+        "f2a30c60e4abcbbdcdf7cb34520b742ae07b6018", 
         {
             "addrType": "pubkey", 
             "isPrivkey": false, 
@@ -441,8 +441,8 @@
         }
     ], 
     [
-        "3ALJH9Y951VCGcVZYAdpA3KchoP9McEj1G", 
-        "5ece0cadddc415b1980f001785947120acdb36fc", 
+        "3B7BZ4asi1qP4jQmo4UjshAp4ZtgmpA7CW", 
+        "674b274f2be5747793d2529972d964f1cfe9f985", 
         {
             "addrType": "script", 
             "isPrivkey": false,