fix up validateaddress to use a btcjson.ValidateAddressResult.

Also fix setting the account and hex fields.

ok @jrick

rpcserver.go

@@ -1693,58 +1693,53 @@ func ValidateAddress(icmd btcjson.Cmd) (interface{}, *btcjson.Error) {
 		return nil, &btcjson.ErrInternal
 	}
 
+	result := btcjson.ValidateAddressResult{}
 	addr, err := btcutil.DecodeAddress(cmd.Address, cfg.Net())
 	if err != nil {
-		return map[string]interface{}{
+		return result, nil
-			"isvalid": false,
-		}, nil
 	}
 
-	result := map[string]interface{}{
+	// We could put whether or not the address is a script here,
-		"address": addr.EncodeAddress(),
+	// by checking the type of "addr", however, the reference
-		"isvalid": true,
+	// implementation only puts that information if the script is
-		// We could put whether or not the address is a script here,
+	// "ismine", and we follow that behaviour.
-		// by checking the type of "addr", however, the reference
+	result.Address = addr.EncodeAddress()
-		// implementation only puts that information if the script is
+	result.IsValid = true
-		// "ismine", and we follow that behaviour.
+
-	}
 	account, err := AcctMgr.AccountByAddress(addr)
 	if err == nil {
 		// we ignore these errors because if this call passes this can't
 		// realistically fail.
 		ainfo, _ := account.AddressInfo(addr)
 
-		result["ismine"] = true
+		result.IsMine = true
-		result["account"] = account
+		result.Account = account.name
 
 		switch info := ainfo.(type) {
 		case *wallet.AddressPubKeyInfo:
-			result["compressed"] = info.Compressed()
+			result.IsCompressed = info.Compressed()
-			result["pubkey"] = info.Pubkey
+			result.PubKey = info.Pubkey
 
 		case *wallet.AddressScriptInfo:
-			result["isscript"] = true
+			result.IsScript = true
 			addrStrings := make([]string,
 				len(info.Addresses))
 			for i, a := range info.Addresses {
 				addrStrings[i] = a.EncodeAddress()
 			}
-			result["addresses"] = addrStrings
+			result.Addresses = addrStrings
-			result["hex"] = info.Script
+			result.Hex = hex.EncodeToString(info.Script)
 
 			class := info.ScriptClass
 			// script type
-			result["script"] = class.String()
+			result.Script = class.String()
 			if class == btcscript.MultiSigTy {
-				result["sigsrequired"] =
+				result.SigsRequired = info.RequiredSigs
-					info.RequiredSigs
 			}
 
 		default:
 			/* This space intentionally left blank */
 		}
-	} else {
-		result["ismine"] = false
 	}
 
 	return result, nil