Merge pull request #234 from syscoin/dev-3.x

3.0.6.1 validateaddress fix

configure.ac

@@ -3,7 +3,7 @@ AC_PREREQ([2.60])
 define(_CLIENT_VERSION_MAJOR, 3)
 define(_CLIENT_VERSION_MINOR, 0)
 define(_CLIENT_VERSION_REVISION, 6)
-define(_CLIENT_VERSION_BUILD, 0)
+define(_CLIENT_VERSION_BUILD, 1)
 define(_CLIENT_VERSION_IS_RELEASE, true)
 define(_DASH_VERSION_MAJOR, 0)
 define(_DASH_VERSION_MINOR, 12)

src/clientversion.h

@@ -17,7 +17,7 @@
 #define CLIENT_VERSION_MAJOR 3
 #define CLIENT_VERSION_MINOR 0
 #define CLIENT_VERSION_REVISION 6
-#define CLIENT_VERSION_BUILD 0
+#define CLIENT_VERSION_BUILD 1
 
 //! Set to true for release, false for prerelease or test build
 #define CLIENT_VERSION_IS_RELEASE true

src/rpc/misc.cpp

@@ -317,6 +317,7 @@ UniValue validateaddress(const JSONRPCRequest& request)
 			"  \"address\" : \"syscoinaddress\", (string) The syscoin address validated\n"
 			// SYSCOIN
 			"  \"zaddress\" : \"syscoinaddress\", (string) The zcash t-addr associated with this syscoin address validated\n"
+			"  \"saddress\" : \"syscoinaddress\", (string) The Syscoin 3 S address scheme associated with this syscoin address validated\n"
 			"  \"btcaddress\" : \"syscoinaddress\", (string) The bitcoin address associated with this syscoin address validated\n"
 			"  \"alias\" : \"syscoinalias\", (string) The syscoin alias associated with this syscoin address validated\n"
             "  \"scriptPubKey\" : \"hex\",       (string) The hex encoded scriptPubKey generated by the address\n"
@@ -349,9 +350,8 @@ UniValue validateaddress(const JSONRPCRequest& request)
     if (isValid)
     {
 		CTxDestination dest = address.Get();
-		CSyscoinAddress saddr;
-		saddr.Set(dest, CChainParams::ADDRESS_SYS);
-		ret.push_back(Pair("address", saddr.ToString()));
+		address = CSyscoinAddress(address.ToString());
+		ret.push_back(Pair("address", address.ToString()));
 
 		CSyscoinAddress zaddr;
 		zaddr.Set(dest, CChainParams::ADDRESS_ZEC);
@@ -361,6 +361,10 @@ UniValue validateaddress(const JSONRPCRequest& request)
 		btcaddr.Set(dest, CChainParams::ADDRESS_BTC);
 		ret.push_back(Pair("btcaddress", btcaddr.ToString()));
 
+		CSyscoinAddress saddr;
+		saddr.Set(dest, CChainParams::ADDRESS_SYS);
+		ret.push_back(Pair("saddress", saddr.ToString()));
+
 		// SYSCOIN alias from address
 		string strAlias;
 		std::vector<unsigned char> vchPubKey;