fix issue mvs-org#226: verifyaddress returns a poorly JSON-formatted …

…response
jowenshaw · Jan 12, 2018 · 0841071 · 0841071
1 parent 3cd1cdf
commit 0841071
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 6 deletions.
diff --git a/include/metaverse/explorer/extensions/commands/validateaddress.hpp b/include/metaverse/explorer/extensions/commands/validateaddress.hpp
@@ -63,7 +63,7 @@ class validateaddress: public command_extension
         )
         (
             "PAYMENT_ADDRESS",
-            value<bc::wallet::payment_address>(&argument_.address),
+            value<std::string>(&argument_.address),
             "Valid payment address. If not specified the address is read from STDIN."
         );
 
@@ -79,7 +79,7 @@ class validateaddress: public command_extension
 
     struct argument
     {
-        bc::wallet::payment_address address;
+        std::string address;
     } argument_;
 
     struct option

diff --git a/src/lib/explorer/extensions/commands/validateaddress.cpp b/src/lib/explorer/extensions/commands/validateaddress.cpp
@@ -34,18 +34,20 @@ console_result validateaddress::invoke (Json::Value& jv_output,
          libbitcoin::server::server_node& node)
 {
     std::string version_info;
-	std::string message{"valid address "};
+    std::string message{"valid address"};
     bool is_valid{true};
 
     auto& blockchain = node.chain_impl();
+    wallet::payment_address payment_address(argument_.address);
 
-    if (!blockchain.chain_settings().use_testnet_rules && argument_.address.version() == 0x32) {
+    if (!blockchain.chain_settings().use_testnet_rules && payment_address.version() == 0x32) {
         version_info = "p2kh(main-net)";
-    } else if (blockchain.chain_settings().use_testnet_rules && argument_.address.version() ==  0x7f ) {
+    } else if (blockchain.chain_settings().use_testnet_rules && payment_address.version() ==  0x7f ) {
         version_info = "p2kh(test-net)";
-    } else if (argument_.address.version() ==  0x05 ) {
+    } else if (payment_address.version() ==  0x05 ) {
         version_info = "p2sh(multi-signature)";
     } else {
+        version_info = "none";
         message = "invalid address!";
         is_valid = false;
     }