Merge 4d9fa04 into merged_master (Elements PR #708)

Author: apoelstra

src/chainparams.cpp

@@ -168,7 +168,7 @@ class CMainParams : public CChainParams {
         base58Prefixes[EXT_SECRET_KEY] = {0x04, 0x88, 0xAD, 0xE4};
 
         bech32_hrp = "bc";
-        blech32_hrp = blech32_hrp;
+        blech32_hrp = bech32_hrp;
 
         vFixedSeeds = std::vector<SeedSpec6>(pnSeed6_main, pnSeed6_main + ARRAYLEN(pnSeed6_main));
 
@@ -276,7 +276,7 @@ class CTestNetParams : public CChainParams {
         base58Prefixes[EXT_SECRET_KEY] = {0x04, 0x35, 0x83, 0x94};
 
         bech32_hrp = "tb";
-        blech32_hrp = blech32_hrp;
+        blech32_hrp = bech32_hrp;
 
         vFixedSeeds = std::vector<SeedSpec6>(pnSeed6_test, pnSeed6_test + ARRAYLEN(pnSeed6_test));
 
@@ -386,7 +386,7 @@ class CRegTestParams : public CChainParams {
         base58Prefixes[EXT_SECRET_KEY] = {0x04, 0x35, 0x83, 0x94};
 
         bech32_hrp = "bcrt";
-        blech32_hrp = blech32_hrp;
+        blech32_hrp = bech32_hrp;
     }
 
     /**