Clean up integration leftovers

Author: napoly

Monero.IntegrationTests/MoneroDaemonRpcIntegrationTest.cs

@@ -328,10 +328,10 @@ public async Task TestGetFeeEstimate()
     {
         GetFeeEstimateResponse feeEstimateResponse = await _daemon.GetFeeEstimate(null);
         TestUtils.TestUnsignedBigInteger(feeEstimateResponse.Fee, true);
-        Assert.Equal(4, feeEstimateResponse.Fees?.Count); // slow, normal, fast, fastest
+        Assert.Equal(4, feeEstimateResponse.Fees.Count); // slow, normal, fast, fastest
         for (int i = 0; i < 4; i++)
         {
-            TestUtils.TestUnsignedBigInteger(feeEstimateResponse?.Fees?[i], true);
+            TestUtils.TestUnsignedBigInteger(feeEstimateResponse?.Fees[i], true);
         }
 
         TestUtils.TestUnsignedBigInteger(feeEstimateResponse?.QuantizationMask, true);

Monero/Common/MoneroUtils.cs

@@ -228,10 +228,10 @@ public static void Log(int level, string message)
         Console.WriteLine(message);
     }
 
-    public static ulong XmrToAtomicUnits(double amountXmr)
+    public static long XmrToAtomicUnits(double amountXmr)
     {
         decimal precise = Math.Round((decimal)amountXmr * XmrAuMultiplier, 0, MidpointRounding.AwayFromZero);
-        return (ulong)new BigInteger(precise);
+        return (long)new BigInteger(precise);
     }
 
     public static double AtomicUnitsToXmr(ulong amountAtomicUnits)

Monero/Daemon/Common/GetFeeEstimateResponse.cs

@@ -5,11 +5,11 @@ namespace Monero.Daemon.Common;
 public class GetFeeEstimateResponse : MoneroRpcResponse
 {
     [JsonPropertyName("fee")]
-    public ulong? Fee { get; set; }
+    public uint Fee { get; set; }
 
     [JsonPropertyName("fees")]
-    public List<ulong>? Fees { get; set; }
+    public required List<uint> Fees { get; set; }
 
     [JsonPropertyName("quantization_mask")]
-    public ulong? QuantizationMask { get; set; }
+    public uint QuantizationMask { get; set; }
 }

Monero/Wallet/Common/MoneroSubaddress.cs

@@ -5,10 +5,10 @@ namespace Monero.Wallet.Common;
 public class MoneroSubaddress
 {
     [JsonPropertyName("major")]
-    public uint? AccountIndex { get; set; }
+    public uint AccountIndex { get; set; }
 
     [JsonPropertyName("minor")]
-    public uint? Index { get; set; }
+    public uint Index { get; set; }
 
     private string? _address;
     private ulong? _balance;

Monero/Wallet/Common/MoneroTxConfig.cs

@@ -76,11 +76,8 @@ public static string GetPaymentUri(MoneroTxConfig? config)
         sb.Append(config.GetAddress());
 
         StringBuilder paramSb = new();
-        ulong? amount = config.GetAmount();
-        if (amount != null)
-        {
-            paramSb.Append("&tx_amount=").Append(MoneroUtils.AtomicUnitsToXmr((ulong)amount));
-        }
+        long amount = config.GetAmount();
+        paramSb.Append("&tx_amount=").Append(MoneroUtils.AtomicUnitsToXmr((ulong)amount));
 
         if (!string.IsNullOrEmpty(config.GetRecipientName()))
         {
@@ -139,7 +136,7 @@ public MoneroTxConfig SetAddress(string address)
         return _destinations[0].Address;
     }
 
-    public MoneroTxConfig SetAmount(ulong amount)
+    public MoneroTxConfig SetAmount(long amount)
     {
         if (_destinations != null && _destinations.Count > 1)
         {
@@ -160,11 +157,11 @@ public MoneroTxConfig SetAmount(ulong amount)
 
     public MoneroTxConfig SetAmount(string amount)
     {
-        return SetAmount(ulong.Parse(amount));
+        return SetAmount(long.Parse(amount));
     }
 
 
-    public ulong? GetAmount()
+    public long GetAmount()
     {
         if (_destinations == null || _destinations.Count != 1)
         {
@@ -174,7 +171,7 @@ public MoneroTxConfig SetAmount(string amount)
         return _destinations[0].Amount;
     }
 
-    public MoneroTxConfig AddDestination(string address, ulong amount)
+    public MoneroTxConfig AddDestination(string address, long amount)
     {
         return AddDestination(new TransferDestination { Address = address, Amount = amount });
     }

Monero/Wallet/Common/TransferDestination.cs

@@ -9,5 +9,5 @@ public class TransferDestination
     public required string Address { get; set; }
 
     [JsonPropertyName("amount")]
-    public ulong Amount { get; set; }
+    public long Amount { get; set; }
 }

Monero/Wallet/Common/TransferItem.cs

@@ -1,6 +1,5 @@
 using System.Text.Json.Serialization;
 
-
 namespace Monero.Wallet.Common;
 
 public abstract class TransferItem
@@ -9,16 +8,16 @@ public abstract class TransferItem
     public required string Address { get; set; }
 
     [JsonPropertyName("amount")]
-    public ulong Amount { get; set; }
+    public long Amount { get; set; }
 
     [JsonPropertyName("amounts")]
-    public List<ulong> Amounts { get; set; } = [];
+    public List<long> Amounts { get; set; } = [];
 
     [JsonPropertyName("destinations")]
     public List<TransferDestination> Destinations { get; set; } = [];
 
     [JsonPropertyName("confirmations")]
-    public ulong Confirmations { get; set; }
+    public int Confirmations { get; set; }
 
     [JsonPropertyName("fee")]
     public ulong Fee { get; set; }
@@ -57,5 +56,5 @@ public abstract class TransferItem
     public required string Type { get; set; }
 
     [JsonPropertyName("unlock_time")]
-    public ulong UnlockTime { get; set; }
+    public int UnlockTime { get; set; }
 }

Monero/Wallet/MoneroWalletRpc.cs

@@ -1541,10 +1541,10 @@ public async Task<GetTransfersResponse> GetTransfers(MoneroTransferQuery? query)
             transfersRequest.AccountIndex = query.AccountIndex;
 
             // set subaddress indices param
-            HashSet<uint> subaddressIndices = [];
+            HashSet<long> subaddressIndices = [];
             if (query.SubaddressIndex != null)
             {
-                subaddressIndices.Add((uint)query.SubaddressIndex);
+                subaddressIndices.Add((long)query.SubaddressIndex);
             }
 
             if (query.GetSubaddressIndices() != null)

Monero/Wallet/Rpc/GetTransfersRequest.cs

@@ -12,7 +12,7 @@ public class GetTransfersRequest
     [JsonPropertyName("filter_by_height ")] public bool? FilterByHeight { get; set; }
     [JsonPropertyName("min_height")] public uint? MinHeight { get; set; }
     [JsonPropertyName("max_height")] public uint? MaxHeight { get; set; }
-    [JsonPropertyName("account_index")] public uint? AccountIndex { get; set; }
-    [JsonPropertyName("subaddr_indices")] public IEnumerable<uint>? SubaddrIndices { get; set; }
+    [JsonPropertyName("account_index")] public long? AccountIndex { get; set; }
+    [JsonPropertyName("subaddr_indices")] public IEnumerable<long>? SubaddrIndices { get; set; }
     [JsonPropertyName("all_accounts")] public bool? AllAccounts { get; set; }
 }

Monero/Wallet/Rpc/ParseUriResponse.cs

@@ -6,7 +6,7 @@ public class ParsedUri
 {
     [JsonPropertyName("address")] public string Address { get; set; } = "";
     [JsonPropertyName("amount")]
-    public ulong Amount { get; set; }
+    public long Amount { get; set; }
 
     [JsonPropertyName("payment_id")] public string PaymentId { get; set; } = "";
     [JsonPropertyName("recipient_name")] public string RecipientName { get; set; } = "";