Fix bug for ListUnspent (scriptPubKey uncorrectly parsed) + RPCClient…

… improvement ListSecrets, ListAddressGrouping, ListAccounts

NBitcoin/RPC/RPCClient.cs

@@ -12,6 +12,63 @@
 
 namespace NBitcoin.RPC
 {
+	public class RPCAccount
+	{
+		public Money Amount
+		{
+			get;
+			set;
+		}
+		public String AccountName
+		{
+			get;
+			set;
+		}
+	}
+
+	public class ChangeAddress
+	{
+		public Money Amount
+		{
+			get;
+			set;
+		}
+		public BitcoinAddress Address
+		{
+			get;
+			set;
+		}
+	}
+
+	public class AddressGrouping
+	{
+		public AddressGrouping()
+		{
+			ChangeAddresses = new List<ChangeAddress>();
+		}
+		public BitcoinAddress PublicAddress
+		{
+			get;
+			set;
+		}
+		public Money Amount
+		{
+			get;
+			set;
+		}
+		public string Account
+		{
+			get;
+			set;
+		}
+
+		public List<ChangeAddress> ChangeAddresses
+		{
+			get;
+			set;
+		}
+	}
+
 	public class RPCClient
 	{
 		private readonly NetworkCredential _Credentials;
@@ -432,5 +489,53 @@ public async Task<uint256[]> GetRawMempoolAsync()
 			var array = (JArray)result.Result;
 			return array.Select(o => (string)o).Select(s => new uint256(s)).ToArray();
 		}
+
+		public IEnumerable<BitcoinSecret> ListSecrets()
+		{
+			foreach(var grouping in ListAddressGroupings())
+			{
+				yield return DumpPrivKey(grouping.PublicAddress);
+				foreach(var change in grouping.ChangeAddresses)
+					yield return DumpPrivKey(change.Address);
+			}
+		}
+
+		public IEnumerable<AddressGrouping> ListAddressGroupings()
+		{
+			var result = SendCommand(RPCOperations.listaddressgroupings);
+			var array = (JArray)result.Result;
+			foreach(var group in array.Children<JArray>())
+			{
+				var grouping = new AddressGrouping();
+				grouping.PublicAddress = BitcoinAddress.Create(group[0][0].ToString());
+				grouping.Amount = Money.Coins(group[0][1].Value<decimal>());
+				grouping.Account = group[0][2].ToString();
+
+				foreach(var subgroup in group.Skip(1))
+				{
+					var change = new ChangeAddress();
+					change.Address = BitcoinAddress.Create(subgroup[0].ToString());
+					change.Amount = Money.Coins(subgroup[1].Value<decimal>());
+					grouping.ChangeAddresses.Add(change);
+				}
+
+				yield return grouping;
+			}
+		}
+
+
+		public IEnumerable<RPCAccount> ListAccounts()
+		{
+			var result = SendCommand(RPCOperations.listaccounts);
+			var obj = (JObject)result.Result;
+			foreach(var prop in obj.Properties())
+			{
+				yield return new RPCAccount()
+				{
+					AccountName = prop.Name,
+					Amount = Money.Coins((decimal)prop.Value)
+				};
+			}
+		}
 	}
 }

NBitcoin/RPC/UnspentCoin.cs

@@ -1,4 +1,5 @@
-using Newtonsoft.Json.Linq;
+using NBitcoin.DataEncoders;
+using Newtonsoft.Json.Linq;
 using System;
 using System.Collections.Generic;
 using System.Linq;
@@ -14,7 +15,7 @@ public UnspentCoin(JObject unspent)
 			OutPoint = new OutPoint(new uint256((string)unspent["txid"]), (uint)unspent["vout"]);
 			Address = Network.CreateFromBase58Data<BitcoinAddress>((string)unspent["address"]);
 			Account = (string)unspent["account"];
-			ScriptPubKey = new Script((string)unspent["scriptPubKey"]);
+			ScriptPubKey = new Script(Encoders.Hex.DecodeData((string)unspent["scriptPubKey"]));
 			var amount = (decimal)unspent["amount"];
 			Amount = new Money((long)(amount * Money.COIN));
 			Confirmations = (uint)unspent["confirmations"];