Merge pull request #61 from RemarkableTools/dev

Dev
RemarkableTools · Jan 26, 2024 · 262aa13 · 262aa13
2 parents 09021bd + 3c4b26d
commit 262aa13
Show file tree

Hide file tree

Showing 8 changed files with 32 additions and 25 deletions.
diff --git a/LICENSE.txt b/LICENSE.txt
@@ -1,4 +1,4 @@
-Copyright 2023 Remarkable Tools
+Copyright 2024 Remarkable Tools
 
 Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
 

diff --git a/src/Mx.NET.SDK.Core/Domain/Abi/AbiDefinition.cs b/src/Mx.NET.SDK.Core/Domain/Abi/AbiDefinition.cs
@@ -62,25 +62,24 @@ private TypeValue GetTypeValue(string type)
             if (Types.Keys.Contains(type))
             {
                 var typeFromStruct = Types[type];
-                if (typeFromStruct.Type == "enum")
+                if (typeFromStruct.Type == "enum" || typeFromStruct.Type == "explicit-enum")
                 {
                     return TypeValue.EnumValue(typeFromStruct.Type,
-                                               typeFromStruct.Variants?
-                                                    .ToList()
-                                                    .Select(v => new VariantDefinition(v.Name, "", v.Discriminant, v.Fields?
-                                                                                                                       .ToList()
-                                                                                                                       .Select(f=> new FieldDefinition(f.Name, "", GetTypeValue(f.Type)))
-                                                                                                                       .ToArray()))
-                                                    .ToArray());
+                                               typeFromStruct.Variants?.ToList()
+                                                                       .Select(v => new VariantDefinition(v.Name,
+                                                                                                          "",
+                                                                                                          v.Discriminant,
+                                                                                                          v.Fields?.ToList()
+                                                                                                                   .Select(f => new FieldDefinition(f.Name, "", GetTypeValue(f.Type)))
+                                                                                                                   .ToArray()))
+                                                                       .ToArray());
                 }
                 else if (typeFromStruct.Type == "struct")
                 {
                     return TypeValue.StructValue(typeFromStruct.Type,
-                                                 typeFromStruct.Fields?
-                                                    .ToList()
-                                                    .Select(f => new FieldDefinition(f.Name, "", GetTypeValue(f.Type)))
-                                                    .ToArray());
-
+                                                 typeFromStruct.Fields?.ToList()
+                                                                       .Select(f => new FieldDefinition(f.Name, "", GetTypeValue(f.Type)))
+                                                                       .ToArray());
                 }
             }
 

diff --git a/src/Mx.NET.SDK.Core/Domain/Values/EnumValue.cs b/src/Mx.NET.SDK.Core/Domain/Values/EnumValue.cs
@@ -1,5 +1,4 @@
 using Mx.NET.SDK.Core.Domain.Helper;
-using System;
 using System.Linq;
 
 namespace Mx.NET.SDK.Core.Domain.Values
@@ -22,6 +21,11 @@ public override string ToString()
             return Discriminant.ToString();
         }
 
+        public T ToEnum<T>()
+        {
+            return JsonWrapper.Deserialize<T>(ToString());
+        }
+
         public override T ToObject<T>()
         {
             return JsonWrapper.Deserialize<T>(ToJson());

diff --git a/src/Mx.NET.SDK.Core/Domain/Values/TypeValue.cs b/src/Mx.NET.SDK.Core/Domain/Values/TypeValue.cs
@@ -1,4 +1,5 @@
 using Newtonsoft.Json;
+using System.Linq;
 
 namespace Mx.NET.SDK.Core.Domain.Values
 {
@@ -37,7 +38,10 @@ public TypeValue(string binaryType, string rustType, VariantDefinition[] variant
         {
             BinaryType = binaryType;
             RustType = rustType;
-            _variantDefinitions = variantDefinitions;
+            if (variantDefinitions.All(v => v.Discriminant == default))
+                _variantDefinitions = variantDefinitions.Select((v, index) => new VariantDefinition(v.Name, v.Description, index, v.Fields)).ToArray();
+            else
+                _variantDefinitions = variantDefinitions;
         }
 
         public TypeValue(string binaryType, TypeValue innerType = null, int? length = null)

diff --git a/src/Mx.NET.SDK.Core/Mx.NET.SDK.Core.csproj b/src/Mx.NET.SDK.Core/Mx.NET.SDK.Core.csproj
@@ -11,14 +11,14 @@
     <RepositoryUrl>https://github.com/RemarkableTools/Mx.NET.SDK/tree/main/src/Mx.NET.SDK.Core</RepositoryUrl>
     <RepositoryType>GitHub</RepositoryType>
     <Company>Remarkable Tools</Company>
-    <Version>2.0.5</Version>
+    <Version>2.0.6</Version>
     <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
     <Title>RemarkableTools.Mx.Core</Title>
     <PackageReadmeFile>README.md</PackageReadmeFile>
     <PackAsTool>False</PackAsTool>
     <PackageLicenseFile>LICENSE.txt</PackageLicenseFile>
     <PackageRequireLicenseAcceptance>False</PackageRequireLicenseAcceptance>
-    <Copyright>Copyright © Remarkable Tools 2023</Copyright>
+    <Copyright>Copyright © Remarkable Tools 2024</Copyright>
     <PackageIcon>RemarkableToolsPackage.jpg</PackageIcon>
     <PackageReleaseNotes>SDK updates and improvements</PackageReleaseNotes>
   </PropertyGroup>
@@ -44,7 +44,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Newtonsoft.Json" Version="13.0.2" />
+    <PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
     <PackageReference Include="Portable.BouncyCastle" Version="1.9.0" />
     <PackageReference Include="System.ValueTuple" Version="4.5.0" />
   </ItemGroup>

diff --git a/src/Mx.NET.SDK.Wallet/Mx.NET.SDK.Wallet.csproj b/src/Mx.NET.SDK.Wallet/Mx.NET.SDK.Wallet.csproj
@@ -15,7 +15,7 @@
     <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
     <PackageLicenseFile>LICENSE.txt</PackageLicenseFile>
     <Title>RemarkableTools.Mx.Wallet</Title>
-    <Copyright>Copyright © Remarkable Tools 2023</Copyright>
+    <Copyright>Copyright © Remarkable Tools 2024</Copyright>
     <PackageIcon>RemarkableToolsPackage.jpg</PackageIcon>
     <PackageReadmeFile>README.md</PackageReadmeFile>
     <PackageReleaseNotes>SDK updates and improvements</PackageReleaseNotes>

diff --git a/src/Mx.NET.SDK/Mx.NET.SDK.csproj b/src/Mx.NET.SDK/Mx.NET.SDK.csproj
@@ -18,7 +18,7 @@
     <PackAsTool>False</PackAsTool>
     <PackageLicenseFile>LICENSE.txt</PackageLicenseFile>
     <PackageRequireLicenseAcceptance>False</PackageRequireLicenseAcceptance>
-    <Copyright>Copyright © Remarkable Tools 2023</Copyright>
+    <Copyright>Copyright © Remarkable Tools 2024</Copyright>
     <PackageIcon>RemarkableToolsPackage.jpg</PackageIcon>
     <PackageReleaseNotes>SDK updates and improvements</PackageReleaseNotes>
   </PropertyGroup>
@@ -45,7 +45,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Newtonsoft.Json" Version="13.0.2" />
+    <PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
     <PackageReference Include="Portable.BouncyCastle" Version="1.9.0" />
     <PackageReference Include="System.Net.Http" Version="4.3.4" />
   </ItemGroup>

diff --git a/tests/MS Testing/MS Testing.csproj b/tests/MS Testing/MS Testing.csproj
@@ -9,9 +9,9 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.7.0" />
-    <PackageReference Include="MSTest.TestAdapter" Version="3.1.1" />
-    <PackageReference Include="MSTest.TestFramework" Version="3.1.1" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.8.0" />
+    <PackageReference Include="MSTest.TestAdapter" Version="3.2.0" />
+    <PackageReference Include="MSTest.TestFramework" Version="3.2.0" />
   </ItemGroup>
 
   <ItemGroup>