Merge pull request #4623

e84843c Broken addresses on command line no longer trigger testnet. (Ross Nicoll)

src/base58.cpp

@@ -215,9 +215,13 @@ bool CBitcoinAddress::Set(const CTxDestination &dest) {
 }
 
 bool CBitcoinAddress::IsValid() const {
+    return IsValid(Params());
+}
+
+bool CBitcoinAddress::IsValid(const CChainParams &params) const {
     bool fCorrectSize = vchData.size() == 20;
-    bool fKnownVersion = vchVersion == Params().Base58Prefix(CChainParams::PUBKEY_ADDRESS) ||
+    bool fKnownVersion = vchVersion == params.Base58Prefix(CChainParams::PUBKEY_ADDRESS) ||
-                         vchVersion == Params().Base58Prefix(CChainParams::SCRIPT_ADDRESS);
+                         vchVersion == params.Base58Prefix(CChainParams::SCRIPT_ADDRESS);
     return fCorrectSize && fKnownVersion;
 }
 

src/base58.h

@@ -104,6 +104,7 @@ public:
     bool Set(const CScriptID &id);
     bool Set(const CTxDestination &dest);
     bool IsValid() const;
+    bool IsValid(const CChainParams &params) const;
 
     CBitcoinAddress() {}
     CBitcoinAddress(const CTxDestination &dest) { Set(dest); }

src/chainparams.cpp

@@ -221,22 +221,23 @@ const CChainParams &Params() {
     return *pCurrentParams;
 }
 
-void SelectParams(CBaseChainParams::Network network) {
+CChainParams &Params(CBaseChainParams::Network network) {
-    SelectBaseParams(network);
     switch (network) {
         case CBaseChainParams::MAIN:
-            pCurrentParams = &mainParams;
+            return mainParams;
-            break;
         case CBaseChainParams::TESTNET:
-            pCurrentParams = &testNetParams;
+            return testNetParams;
-            break;
         case CBaseChainParams::REGTEST:
-            pCurrentParams = &regTestParams;
+            return regTestParams;
-            break;
         default:
             assert(false && "Unimplemented network");
-            return;
+            return mainParams;
+    }
 }
+
+void SelectParams(CBaseChainParams::Network network) {
+    SelectBaseParams(network);
+    pCurrentParams = &Params(network);
 }
 
 bool SelectParamsFromCommandLine() {

src/chainparams.h

@@ -111,6 +111,9 @@ protected:
  */
 const CChainParams &Params();
 
+/** Return parameters for the given network. */
+CChainParams &Params(CBaseChainParams::Network network);
+
 /** Sets the params returned by Params() to those for the given network. */
 void SelectParams(CBaseChainParams::Network network);
 

src/qt/paymentserver.cpp

@@ -10,6 +10,7 @@
 #include "optionsmodel.h"
 
 #include "base58.h"
+#include "chainparams.h"
 #include "ui_interface.h"
 #include "util.h"
 #include "wallet.h"
@@ -200,8 +201,11 @@ bool PaymentServer::ipcParseCommandLine(int argc, char* argv[])
             {
                 CBitcoinAddress address(r.address.toStdString());
 
+                if (address.IsValid(Params(CBaseChainParams::MAIN)))
+                {
                     SelectParams(CBaseChainParams::MAIN);
-                if (!address.IsValid())
+                }
+                else if (address.IsValid(Params(CBaseChainParams::TESTNET)))
                 {
                     SelectParams(CBaseChainParams::TESTNET);
                 }