Define GetAddressRequest and remove dependency on RpcBalanceInfo

Author: deverickapollo

Monero/Wallet/MoneroWalletRpc.cs

@@ -711,21 +711,21 @@ public async Task<List<MoneroSubaddress>> GetSubaddresses(uint accountIdx,
         bool skipBalances, List<uint>? subaddressIndices)
     {
         // fetch subaddresses
-        MoneroJsonRpcParams parameters = [];
-        parameters.Add("account_index", accountIdx);
-        if (subaddressIndices != null && subaddressIndices.Count > 0)
-        {
-            parameters.Add("address_index", subaddressIndices);
-        }
-
-        var result = await _rpc.SendCommandAsync<MoneroJsonRpcParams, GetAddressResponse>("get_address", parameters);
+        GetAddressRequest addressRequest = new() { AccountIndex = accountIdx, AddressIndex = subaddressIndices };
+        var result = await _rpc.SendCommandAsync<GetAddressRequest, GetAddressResponse>("get_address", addressRequest);
 
         // initialize subaddresses
         List<MoneroSubaddress> subaddresses = [];
-        foreach (RpcBalanceInfo rpcSubaddress in result.Addresses)
+        foreach (RpcAddressInfo rpcAddress in result.Addresses)
         {
-            MoneroSubaddress subaddress = ConvertRpcSubaddress(rpcSubaddress);
-            subaddress.AccountIndex = accountIdx;
+            MoneroSubaddress subaddress = new()
+            {
+                AccountIndex = accountIdx,
+                Index = rpcAddress.AddressIndex
+            };
+            subaddress.SetAddress(rpcAddress.Address);
+            subaddress.SetLabel(rpcAddress.Label);
+            subaddress.SetIsUsed(rpcAddress.Used);
             subaddresses.Add(subaddress);
         }
 
@@ -742,7 +742,8 @@ public async Task<List<MoneroSubaddress>> GetSubaddresses(uint accountIdx,
             }
 
             // fetch and initialize balances
-            var getBalanceResult = await _rpc.SendCommandAsync<MoneroJsonRpcParams, GetBalanceResponse>("get_balance", parameters);
+            GetBalanceRequest balanceRequest = new() { AccountIndex = accountIdx, AddressIndices = subaddressIndices };
+            var getBalanceResult = await _rpc.SendCommandAsync<GetBalanceRequest, GetBalanceResponse>("get_balance", balanceRequest);
             foreach (RpcBalanceInfo rpcSubaddress in
                      getBalanceResult.PerSubaddress)
             {
@@ -1484,10 +1485,12 @@ private async Task<List<ulong>> GetBalances(uint? accountIdx, uint? subaddressId
             return [balance, unlockedBalance];
         }
 
-        MoneroJsonRpcParams parameters = [];
-        parameters.Add("account_index", accountIdx);
-        parameters.Add("address_indices", subaddressIdx == null ? null : new List<uint?> { subaddressIdx });
-        var result = await _rpc.SendCommandAsync<MoneroJsonRpcParams, GetBalanceResponse>("get_balance", parameters);
+        GetBalanceRequest balanceRequest = new()
+        {
+            AccountIndex = accountIdx.Value,
+            AddressIndices = subaddressIdx.HasValue ? [subaddressIdx.Value] : null
+        };
+        var result = await _rpc.SendCommandAsync<GetBalanceRequest, GetBalanceResponse>("get_balance", balanceRequest);
         if (subaddressIdx == null)
         {
             return [result.Balance, result.UnlockedBalance];

Monero/Wallet/Rpc/GetAddressRequest.cs

@@ -0,0 +1,9 @@
+using System.Text.Json.Serialization;
+
+namespace Monero.Wallet.Rpc;
+
+public class GetAddressRequest
+{
+    [JsonPropertyName("account_index")] public uint AccountIndex { get; set; }
+    [JsonPropertyName("address_index")] public List<uint>? AddressIndex { get; set; }
+}

Monero/Wallet/Rpc/GetAddressResponse.cs

@@ -4,5 +4,6 @@ namespace Monero.Wallet.Rpc;
 
 public class GetAddressResponse
 {
-    [JsonPropertyName("addresses")] public List<RpcBalanceInfo> Addresses { get; set; } = [];
+    [JsonPropertyName("address")] public string Address { get; set; } = "";
+    [JsonPropertyName("addresses")] public List<RpcAddressInfo> Addresses { get; set; } = [];
 }

Monero/Wallet/Rpc/GetBalanceRequest.cs

@@ -4,5 +4,8 @@ namespace Monero.Wallet.Rpc;
 
 public class GetBalanceRequest
 {
+    [JsonPropertyName("account_index")] public uint AccountIndex { get; set; }
+    [JsonPropertyName("address_indices")] public List<uint>? AddressIndices { get; set; }
     [JsonPropertyName("all_accounts")] public bool AllAccounts { get; set; }
+    [JsonPropertyName("strict")] public bool Strict { get; set; }
 }

Monero/Wallet/Rpc/GetBalanceResponse.cs

@@ -10,5 +10,7 @@ public class GetBalanceResponse
     public ulong Balance { get; set; }
 
     [JsonPropertyName("unlocked_balance")] public ulong UnlockedBalance { get; set; }
+    [JsonPropertyName("time_to_unlock")] public ulong TimeToUnlock { get; set; }
+    [JsonPropertyName("blocks_to_unlock")] public ulong BlocksToUnlock { get; set; }
     [JsonPropertyName("per_subaddress")] public List<RpcBalanceInfo> PerSubaddress { get; set; } = [];
 }

Monero/Wallet/Rpc/RpcAddressInfo.cs

@@ -0,0 +1,11 @@
+using System.Text.Json.Serialization;
+
+namespace Monero.Wallet.Rpc;
+
+public class RpcAddressInfo
+{
+    [JsonPropertyName("address")] public string Address { get; set; } = "";
+    [JsonPropertyName("address_index")] public uint AddressIndex { get; set; }
+    [JsonPropertyName("label")] public string Label { get; set; } = "";
+    [JsonPropertyName("used")] public bool Used { get; set; }
+}