initial

dkackman · Dec 25, 2023 · 276ebcf · 276ebcf
1 parent 27d49ff
commit 276ebcf
Show file tree

Hide file tree

Showing 32 changed files with 175 additions and 312 deletions.
diff --git a/src/chia-dotnet/CATWallet.cs b/src/chia-dotnet/CATWallet.cs
@@ -9,17 +9,13 @@ namespace chia.dotnet
     /// <summary>
     /// Wraps a CAT wallet
     /// </summary>
-    public sealed class CATWallet : Wallet
+    /// <remarks>
+    /// ctor
+    /// </remarks>
+    /// <param name="walletId">The wallet_id to wrap</param>
+    /// <param name="walletProxy">Wallet RPC proxy to use for communication</param>
+    public sealed class CATWallet(uint walletId, WalletProxy walletProxy) : Wallet(walletId, walletProxy)
     {
-        /// <summary>
-        /// ctor
-        /// </summary>
-        /// <param name="walletId">The wallet_id to wrap</param>
-        /// <param name="walletProxy">Wallet RPC proxy to use for communication</param>
-        public CATWallet(uint walletId, WalletProxy walletProxy)
-            : base(walletId, walletProxy)
-        {
-        }
 
         /// <summary>
         /// Validates that <see cref="Wallet.WalletId"/> is a <see cref="WalletType.CAT"/>

diff --git a/src/chia-dotnet/CRCATWallet.cs b/src/chia-dotnet/CRCATWallet.cs
@@ -7,17 +7,13 @@ namespace chia.dotnet
     /// <summary>
     /// Wraps a CRCAT  Wallet
     /// </summary>
-    public sealed class CRCATWallet : Wallet
+    /// <remarks>
+    /// ctor
+    /// </remarks>
+    /// <param name="walletId">The wallet_id to wrap</param>
+    /// <param name="walletProxy">Wallet RPC proxy to use for communication</param>
+    public sealed class CRCATWallet(uint walletId, WalletProxy walletProxy) : Wallet(walletId, walletProxy)
     {
-        /// <summary>
-        /// ctor
-        /// </summary>
-        /// <param name="walletId">The wallet_id to wrap</param>
-        /// <param name="walletProxy">Wallet RPC proxy to use for communication</param>
-        public CRCATWallet(uint walletId, WalletProxy walletProxy)
-            : base(walletId, walletProxy)
-        {
-        }
 
         /// <summary>
         /// Validates that <see cref="Wallet.WalletId"/> is a <see cref="WalletType.CRCAT"/>

diff --git a/src/chia-dotnet/ChiaTypes/Announcement.cs b/src/chia-dotnet/ChiaTypes/Announcement.cs
@@ -4,6 +4,6 @@ public record Announcement
     {
         public string OriginInfo { get; init; } = string.Empty;
         public string Message { get; init; } = string.Empty;
-        public string MorphBytes { get; init; } = string.Empty;
+        public string? MorphBytes { get; init; }
     }
 }
diff --git a/src/chia-dotnet/ChiaTypes/AutoClaimSettings.cs b/src/chia-dotnet/ChiaTypes/AutoClaimSettings.cs
@@ -5,6 +5,6 @@ public record AutoClaimSettings
         public bool Enabled { get; init; }
         public ulong TxFee { get; init; }
         public ulong MinAmount { get; init; }
-        public ushort BatchSize { get; init; }
+        public ushort BatchSize { get; init; } = 50;
     }
 }
diff --git a/src/chia-dotnet/ChiaTypes/BlockSpendWithConditions.cs b/src/chia-dotnet/ChiaTypes/BlockSpendWithConditions.cs
@@ -5,6 +5,6 @@ namespace chia.dotnet
     public record BlockSpendWithConditions
     {
         public CoinSpend CoinSpend { get; init; } = new();
-        public IEnumerable<ConditionWithArgs> Conditions { get; init; } = new List<ConditionWithArgs>();
+        public IEnumerable<ConditionWithVars> Conditions { get; init; } = new List<ConditionWithVars>();
     }
 }
diff --git a/src/chia-dotnet/ChiaTypes/CoinAnnouncement.cs b/src/chia-dotnet/ChiaTypes/CoinAnnouncement.cs
@@ -4,6 +4,6 @@ public record CoinAnnouncement
     {
         public string CoinId { get; init; } = string.Empty;
         public string Message { get; init; } = string.Empty;
-        public string MorphBytes { get; init; } = string.Empty;
+        public string? MorphBytes { get; init; }
     }
 }
diff --git a/src/chia-dotnet/ChiaTypes/Condition.cs b/src/chia-dotnet/ChiaTypes/Condition.cs
@@ -14,6 +14,6 @@ namespace chia.dotnet
     public record Condition
     {
         public string ConditionOpcode { get; init; } = string.Empty;
-        public IEnumerable<ConditionWithArgs> Args { get; init; } = new List<ConditionWithArgs>();
+        public IEnumerable<ConditionWithVars> Args { get; init; } = new List<ConditionWithVars>();
     }
 }
diff --git a/src/chia-dotnet/ChiaTypes/ConditionConverter.cs b/src/chia-dotnet/ChiaTypes/ConditionConverter.cs
@@ -16,13 +16,13 @@ internal sealed class ConditionConverter : JsonConverter<Condition>
 
             var opcode = reader.ReadAsString(); // the opcode is stored without a name (as part of an unnamed tuple (aka array in json))
             _ = reader.Read(); // move ahead to the start of the collection
-            var args = serializer.Deserialize<IEnumerable<ConditionWithArgs>>(reader);
+            var args = serializer.Deserialize<IEnumerable<ConditionWithVars>>(reader);
             _ = reader.Read();
 
             return new Condition()
             {
                 ConditionOpcode = opcode ?? string.Empty,
-                Args = args ?? new List<ConditionWithArgs>()
+                Args = args ?? new List<ConditionWithVars>()
             };
         }
 

diff --git a/src/chia-dotnet/ChiaTypes/ConditionValidTimes.cs b/src/chia-dotnet/ChiaTypes/ConditionValidTimes.cs
@@ -0,0 +1,14 @@
+namespace chia.dotnet
+{
+    public record ConditionValidTimes
+    {
+        public ulong? MinSecsSinceCreated { get; init; }
+        public ulong? MinTime { get; init; }
+        public ulong? MinBlocksSinceCreated { get; init; }
+        public uint? MinHeight { get; init; }
+        public ulong? MaxSecAfterCreated { get; init; }
+        public ulong? MaxTime { get; init; }
+        public uint? MaxBlocksAfterCreated { get; init; }
+        public uint? MaxHeight { get; init; }
+    }
+}
diff --git a/...hia-dotnet/ChiaTypes/ConditionWithArgs.cs → ...hia-dotnet/ChiaTypes/ConditionWithVars.cs b/...hia-dotnet/ChiaTypes/ConditionWithArgs.cs → ...hia-dotnet/ChiaTypes/ConditionWithVars.cs
@@ -6,7 +6,7 @@ namespace chia.dotnet
     /// This structure is used to store parsed CLVM conditions
     /// Conditions in CLVM have either format of(opcode, var1) or(opcode, var1, var2)
     /// </summary>
-    public record ConditionWithArgs
+    public record ConditionWithVars
     {
         public ushort Opcode { get; init; }
         public IEnumerable<string> Vars { get; init; } = new List<string>();

diff --git a/src/chia-dotnet/ChiaTypes/PuzzleAnnouncement.cs b/src/chia-dotnet/ChiaTypes/PuzzleAnnouncement.cs
@@ -4,6 +4,6 @@ public record PuzzleAnnouncement
     {
         public string PuzzleHash { get; init; } = string.Empty;
         public string Message { get; init; } = string.Empty;
-        public string MorphBytes { get; init; } = string.Empty;
+        public string? MorphBytes { get; init; }
     }
 }
diff --git a/src/chia-dotnet/ChiaTypes/TransactionRecord.cs b/src/chia-dotnet/ChiaTypes/TransactionRecord.cs
@@ -46,5 +46,6 @@ public record TransactionRecord
         public uint WalletId { get; init; }
         [JsonIgnore]
         public DateTime CreatedAtDateTime => CreatedAtTime.ToDateTime();
+        public ConditionValidTimes ValidTimes { get; init; } = new();
     }
 }
diff --git a/src/chia-dotnet/ChiaTypes/TransactionTypeFilter.cs b/src/chia-dotnet/ChiaTypes/TransactionTypeFilter.cs
@@ -1,10 +1,11 @@
-namespace chia.dotnet
+using System.Collections.Generic;
+
+namespace chia.dotnet
 {
     public record TransactionTypeFilter
     {
-        public string AssetId { get; init; } = string.Empty;
-        public string Name { get; init; } = string.Empty;
-        public uint FirstSeenHeight { get; init; }
-        public string SenderPuzzleHash { get; init; } = string.Empty;
+        public IEnumerable<byte> Values { get; init; } = new List<byte>();
+
+        public FilterMode Mode { get; init; } = FilterMode.Exlude;
     }
 }
diff --git a/src/chia-dotnet/CrawlerProxy.cs b/src/chia-dotnet/CrawlerProxy.cs
@@ -9,17 +9,13 @@ namespace chia.dotnet
     /// <summary>
     /// Proxy that communicates with the crawler
     /// </summary>
-    public sealed class CrawlerProxy : ServiceProxy
+    /// <remarks>
+    /// ctor
+    /// </remarks>
+    /// <param name="rpcClient"><see cref="IRpcClient"/> instance to use for rpc communication</param>
+    /// <param name="originService"><see cref="Message.Origin"/></param>
+    public sealed class CrawlerProxy(IRpcClient rpcClient, string originService) : ServiceProxy(rpcClient, ServiceNames.Crawler, originService)
     {
-        /// <summary>
-        /// ctor
-        /// </summary>
-        /// <param name="rpcClient"><see cref="IRpcClient"/> instance to use for rpc communication</param>
-        /// <param name="originService"><see cref="Message.Origin"/></param>
-        public CrawlerProxy(IRpcClient rpcClient, string originService)
-            : base(rpcClient, ServiceNames.Crawler, originService)
-        {
-        }
 
         /// <summary>
         /// Retrieves aggregate information about peers

diff --git a/src/chia-dotnet/DAOWallet.cs b/src/chia-dotnet/DAOWallet.cs
@@ -7,17 +7,13 @@ namespace chia.dotnet
     /// <summary>
     /// Wraps a DAO Wallet
     /// </summary>
-    public sealed class DAOWallet : Wallet
+    /// <remarks>
+    /// ctor
+    /// </remarks>
+    /// <param name="walletId">The wallet_id to wrap</param>
+    /// <param name="walletProxy">Wallet RPC proxy to use for communication</param>
+    public sealed class DAOWallet(uint walletId, WalletProxy walletProxy) : Wallet(walletId, walletProxy)
     {
-        /// <summary>
-        /// ctor
-        /// </summary>
-        /// <param name="walletId">The wallet_id to wrap</param>
-        /// <param name="walletProxy">Wallet RPC proxy to use for communication</param>
-        public DAOWallet(uint walletId, WalletProxy walletProxy)
-            : base(walletId, walletProxy)
-        {
-        }
 
         /// <summary>
         /// Validates that <see cref="Wallet.WalletId"/> is a <see cref="WalletType.DAO"/>

diff --git a/src/chia-dotnet/DIDWallet.cs b/src/chia-dotnet/DIDWallet.cs
@@ -9,17 +9,13 @@ namespace chia.dotnet
     /// <summary>
     /// Wraps a Distributed Identity Wallet
     /// </summary>
-    public sealed class DIDWallet : Wallet
+    /// <remarks>
+    /// ctor
+    /// </remarks>
+    /// <param name="walletId">The wallet_id to wrap</param>
+    /// <param name="walletProxy">Wallet RPC proxy to use for communication</param>
+    public sealed class DIDWallet(uint walletId, WalletProxy walletProxy) : Wallet(walletId, walletProxy)
     {
-        /// <summary>
-        /// ctor
-        /// </summary>
-        /// <param name="walletId">The wallet_id to wrap</param>
-        /// <param name="walletProxy">Wallet RPC proxy to use for communication</param>
-        public DIDWallet(uint walletId, WalletProxy walletProxy)
-            : base(walletId, walletProxy)
-        {
-        }
 
         /// <summary>
         /// Validates that <see cref="Wallet.WalletId"/> is a <see cref="WalletType.DISTRIBUTED_ID"/>
@@ -40,10 +36,7 @@ public override async Task Validate(CancellationToken cancellationToken = defaul
         /// <returns>An awaitable <see cref="Task"/></returns>
         public async Task UpdateRecoveryIds(IEnumerable<string> newList, ulong? numVerificationsRequired = null, bool? reusePuzhash = null, CancellationToken cancellationToken = default)
         {
-            if (newList is null)
-            {
-                throw new ArgumentNullException(nameof(newList));
-            }
+            ArgumentNullException.ThrowIfNull(newList);
 
             dynamic data = CreateWalletDataObject();
             data.new_list = newList.ToList();
@@ -62,10 +55,7 @@ public async Task UpdateRecoveryIds(IEnumerable<string> newList, ulong? numVerif
         /// <returns>An awaitable <see cref="Task"/></returns>
         public async Task UpdateRecoveryIds(IEnumerable<string> newList, ulong numVerificationsRequired, CancellationToken cancellationToken = default)
         {
-            if (newList is null)
-            {
-                throw new ArgumentNullException(nameof(newList));
-            }
+            ArgumentNullException.ThrowIfNull(newList);
 
             dynamic data = CreateWalletDataObject();
             data.new_list = newList.ToList();
@@ -212,10 +202,7 @@ public async Task<SpendBundle> UpdateMetadata(string metadata, bool? reusePuzhas
         /// <returns>An awaitable <see cref="Task"/></returns>
         public async Task RecoverySpend(IEnumerable<string> attestData, string? pubkey, string? puzzlehash, CancellationToken cancellationToken = default)
         {
-            if (attestData is null)
-            {
-                throw new ArgumentNullException(nameof(attestData));
-            }
+            ArgumentNullException.ThrowIfNull(attestData);
 
             dynamic data = CreateWalletDataObject();
             data.attest_data = attestData.ToList();

diff --git a/src/chia-dotnet/DaemonProxy.cs b/src/chia-dotnet/DaemonProxy.cs
@@ -12,17 +12,13 @@ namespace chia.dotnet
     /// The daemon can be used to proxy messages to and from other chia services as well
     /// as controlling the <see cref="PlotterProxy"/> and having it's own procedures
     /// </summary>
-    public sealed class DaemonProxy : ServiceProxy
+    /// <remarks>
+    /// ctor
+    /// </remarks>
+    /// <param name="rpcClient"><see cref="IRpcClient"/> instance to use for rpc communication</param>
+    /// <param name="originService"><see cref="Message.Origin"/></param>
+    public sealed class DaemonProxy(WebSocketRpcClient rpcClient, string originService) : ServiceProxy(rpcClient, ServiceNames.Daemon, originService)
     {
-        /// <summary>
-        /// ctor
-        /// </summary>
-        /// <param name="rpcClient"><see cref="IRpcClient"/> instance to use for rpc communication</param>
-        /// <param name="originService"><see cref="Message.Origin"/></param>
-        public DaemonProxy(WebSocketRpcClient rpcClient, string originService)
-            : base(rpcClient, ServiceNames.Daemon, originService)
-        {
-        }
 
         /// <summary>
         /// Sends ping message to the service
@@ -42,7 +38,7 @@ public async Task Ping(CancellationToken cancellationToken = default)
         /// <remarks>This only works for daemons because they can forward messages to other services through their <see cref="WebSocketRpcClient"/></remarks>
         public T CreateProxyFrom<T>() where T : ServiceProxy
         {
-            var constructor = typeof(T).GetConstructor(new Type[] { typeof(IRpcClient), typeof(string) });
+            var constructor = typeof(T).GetConstructor([typeof(IRpcClient), typeof(string)]);
             return constructor is null || constructor.Invoke(new object[] { RpcClient, OriginService }) is not T proxy
                 ? throw new InvalidOperationException($"Cannot create a {typeof(T).Name}")
                 : proxy;

diff --git a/src/chia-dotnet/DataLayerProxy.cs b/src/chia-dotnet/DataLayerProxy.cs
@@ -10,17 +10,13 @@ namespace chia.dotnet
     /// <summary>
     /// Proxy that communicates with the Data Layer
     /// </summary>
-    public sealed class DataLayerProxy : ServiceProxy
+    /// <remarks>
+    /// ctor
+    /// </remarks>
+    /// <param name="rpcClient"><see cref="IRpcClient"/> instance to use for rpc communication</param>
+    /// <param name="originService"><see cref="Message.Origin"/></param>
+    public sealed class DataLayerProxy(IRpcClient rpcClient, string originService) : ServiceProxy(rpcClient, ServiceNames.DataLayer, originService)
     {
-        /// <summary>
-        /// ctor
-        /// </summary>
-        /// <param name="rpcClient"><see cref="IRpcClient"/> instance to use for rpc communication</param>
-        /// <param name="originService"><see cref="Message.Origin"/></param>
-        public DataLayerProxy(IRpcClient rpcClient, string originService)
-            : base(rpcClient, ServiceNames.DataLayer, originService)
-        {
-        }
 
         /// <summary>
         /// Adds a mirror

diff --git a/src/chia-dotnet/DataLayerWallet.cs b/src/chia-dotnet/DataLayerWallet.cs
@@ -9,17 +9,13 @@ namespace chia.dotnet
     /// <summary>
     /// Wraps a Data Layer Wallet
     /// </summary>
-    public sealed class DataLayerWallet : Wallet
+    /// <remarks>
+    /// ctor
+    /// </remarks>
+    /// <param name="walletId">The wallet_id to wrap</param>
+    /// <param name="walletProxy">Wallet RPC proxy to use for communication</param>
+    public sealed class DataLayerWallet(uint walletId, WalletProxy walletProxy) : Wallet(walletId, walletProxy)
     {
-        /// <summary>
-        /// ctor
-        /// </summary>
-        /// <param name="walletId">The wallet_id to wrap</param>
-        /// <param name="walletProxy">Wallet RPC proxy to use for communication</param>
-        public DataLayerWallet(uint walletId, WalletProxy walletProxy)
-            : base(walletId, walletProxy)
-        {
-        }
 
         /// <summary>
         /// Validates that <see cref="Wallet.WalletId"/> is a <see cref="WalletType.DATA_LAYER"/>

diff --git a/src/chia-dotnet/FarmerProxy.cs b/src/chia-dotnet/FarmerProxy.cs
@@ -10,17 +10,13 @@ namespace chia.dotnet
     /// <summary>
     /// Proxy that communicates with the farmer
     /// </summary>
-    public sealed class FarmerProxy : ServiceProxy
+    /// <remarks>
+    /// ctor
+    /// </remarks>
+    /// <param name="rpcClient"><see cref="IRpcClient"/> instance to use for rpc communication</param>
+    /// <param name="originService"><see cref="Message.Origin"/></param>
+    public sealed class FarmerProxy(IRpcClient rpcClient, string originService) : ServiceProxy(rpcClient, ServiceNames.Farmer, originService)
     {
-        /// <summary>
-        /// ctor
-        /// </summary>
-        /// <param name="rpcClient"><see cref="IRpcClient"/> instance to use for rpc communication</param>
-        /// <param name="originService"><see cref="Message.Origin"/></param>
-        public FarmerProxy(IRpcClient rpcClient, string originService)
-            : base(rpcClient, ServiceNames.Farmer, originService)
-        {
-        }
 
         /// <summary>
         /// Get the farm and pool reward targets 
@@ -56,7 +52,7 @@ public FarmerProxy(IRpcClient rpcClient, string originService)
         /// <returns>The farm and pool reward targets</returns>
         public async Task<(string FarmerTarget, string PoolTarget, bool HaveFarmerSk, bool HavePoolSk)> GetRewardTargetsIncludingPrivateKey(CancellationToken cancellationToken = default)
         {
-            return await GetRewardTargetsIncludingPrivateKey(cancellationToken: cancellationToken).ConfigureAwait(false);
+            return await GetRewardTargetsIncludingPrivateKey(500, cancellationToken: cancellationToken).ConfigureAwait(false);
         }
 
         /// <summary>