Next ver 066 (#82)

* updated to use api 0.9.24-rc1 for check metadata hash
removed unused types from TransactionEvent

* minor fixes transition for metadata v15

Author: darkfriend77

Substrate.ServiceLayer/SubstrateMockupDataProvider.cs

@@ -3,6 +3,7 @@
 using Substrate.NetApi.Model.Rpc;
 using Substrate.NetApi.Model.Types;
 using Substrate.NetApi.Model.Types.Metadata;
+using Substrate.NetApi.Model.Types.Metadata.V14;
 using Substrate.ServiceLayer.Storage;
 using System;
 using System.Collections.Generic;
@@ -18,7 +19,7 @@ public class SubstrateMockupDataProvider : IStorageDataProvider
 
       public SubstrateMockupDataProvider(string metadata)
       {
-         var runtimeMetadata = new RuntimeMetadata();
+         var runtimeMetadata = new RuntimeMetadata<RuntimeMetadataV14>();
          runtimeMetadata.Create(metadata);
 
          _metaData = new MetaData(runtimeMetadata, string.Empty);

Tools/Substrate.DotNet/Extensions/ReflectedEndpointExtensions.cs

@@ -3,12 +3,11 @@
 using Substrate.NetApi.Attributes;
 using Substrate.NetApi.Model.Types;
 using Substrate.NetApi.Model.Types.Base;
-using Substrate.NetApi.Model.Types.Metadata.V14;
+using Substrate.NetApi.Model.Types.Metadata.Base;
 using Substrate.NetApi.Model.Types.Primitive;
 using System;
 using System.CodeDom;
 using System.Collections.Generic;
-using System.Diagnostics;
 using System.Linq;
 using System.Reflection;
 using System.Threading.Tasks;

Tools/Substrate.DotNet/Service/Generators/Base/SolutionGeneratorBase.cs

@@ -1,16 +1,13 @@
-using Substrate.DotNet.Extensions;
+using Serilog;
 using Substrate.DotNet.Service.Node;
 using Substrate.NetApi.Model.Meta;
-using Substrate.NetApi.Model.Types.Metadata.V14;
-using Substrate.NetApi.Model.Types.Primitive;
-using Serilog;
+using Substrate.NetApi.Model.Types.Metadata.Base;
 using System;
 using System.Collections.Generic;
 using System.Linq;
 
 namespace Substrate.DotNet.Service.Generators.Base
 {
-
    /// <summary>
    /// Contains the common as well as the abstract methods to be implemented
    /// so that the solution and the respective classes are generated
@@ -39,7 +36,7 @@ public void Generate(MetaData metadata)
       }
 
       /// <summary>
-      /// Generates the respective classes 
+      /// Generates the respective classes
       /// </summary>
       /// <param name="metadata"></param>
       protected abstract void GenerateClasses(MetaData metadata);
@@ -61,7 +58,7 @@ protected NodeTypeResolver GenerateTypes(Dictionary<uint, NodeType> nodeTypes, s
                      StructBuilder.Init(ProjectName, type.Id, type, resolver)
                          .Create()
                          .Build(write: write, out bool success, basePath);
-                     
+
                      if (!success)
                      {
                         Logger.Error($"Could not build type {type.Id}!");
@@ -125,7 +122,7 @@ private void CallVariant(string variantType, NodeTypeVariant nodeType, ref NodeT
                break;
          }
       }
-      
+
       private static Dictionary<string, int> GetRuntimeIndex(Dictionary<uint, NodeType> nodeTypes, string runtime, string runtimeType)
       {
          NodeType nodeType = nodeTypes.Select(p => p.Value).Where(p => p.Path != null && p.Path.Length == 2 && p.Path[0] == runtime && p.Path[1] == runtimeType).FirstOrDefault();

Tools/Substrate.DotNet/Service/Node/GetMetadata.cs

@@ -9,6 +9,7 @@
 using System.IO;
 using System.Threading;
 using System.Threading.Tasks;
+using Substrate.NetApi.Model.Types.Metadata.V14;
 
 namespace Substrate.DotNet.Service.Node
 {
@@ -50,7 +51,7 @@ internal static string GetRuntimeFromFile(ILogger logger, string serviceArgument
       {
          try
          {
-            var runtimeMetadata = new RuntimeMetadata();
+            var runtimeMetadata = new RuntimeMetadata<RuntimeMetadataV14>();
             runtimeMetadata.Create(serializedText);
             return new MetaData(runtimeMetadata, string.Empty);
          }
@@ -98,4 +99,4 @@ internal static string GetRuntimeFromFile(ILogger logger, string serviceArgument
          return null;
       }
    }
-}
+}

Tools/Substrate.DotNet/Service/Node/NodeTypeResolver.cs

@@ -1,11 +1,11 @@
 #nullable enable
+
 using Substrate.DotNet.Extensions;
 using Substrate.NetApi.Model.Meta;
-using Substrate.NetApi.Model.Types.Metadata.V14;
+using Substrate.NetApi.Model.Types.Metadata.Base;
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using System.Text;
 using System.Text.RegularExpressions;
 
 namespace Substrate.DotNet.Service.Node
@@ -65,15 +65,17 @@ public string Namespace
             string[]? paths = BaseName.Split('.').ToArray();
             string[]? reduced = paths.Take(paths.Length - 1).ToArray();
             string? result = string.Join('.', reduced);
-            
+
             if (string.IsNullOrEmpty(result))
             {
                switch (NamespaceSource)
                {
                   case NodeTypeNamespaceSource.Primitive:
                      return "Substrate.NetApi.Model.Types.Primitive";
+
                   case NodeTypeNamespaceSource.Generated:
                      return $"{Resolver.NetApiProjectName}.Generated.Types.Base";
+
                   default:
                      break;
                }
@@ -87,9 +89,13 @@ public string Namespace
       }
 
       public static NodeTypeName Primitive(NodeTypeResolver resolver, string baseName) => new NodeTypeName(resolver, NodeTypeNamespaceSource.Primitive, baseName, null);
+
       public static NodeTypeName Base(NodeTypeResolver resolver, string baseName) => new NodeTypeName(resolver, NodeTypeNamespaceSource.Base, baseName, null);
+
       public static NodeTypeName Base(NodeTypeResolver resolver, string baseName, NodeTypeName[]? arguments) => new NodeTypeName(resolver, NodeTypeNamespaceSource.Base, baseName, arguments);
+
       public static NodeTypeName Generated(NodeTypeResolver resolver, string baseName) => new NodeTypeName(resolver, NodeTypeNamespaceSource.Generated, baseName, null);
+
       public static NodeTypeName Generated(NodeTypeResolver resolver, string baseName, NodeTypeName[]? arguments) => new NodeTypeName(resolver, NodeTypeNamespaceSource.Generated, baseName, arguments);
 
       internal static NodeTypeName Array(NodeTypeResolver nodeTypeResolver, NodeTypeName nodeTypeName, uint length)
@@ -238,8 +244,10 @@ private NodeTypeName ResolveVariantType(NodeTypeVariant nodeTypeVariant, Diction
          {
             case "Option":
                return NodeTypeName.Base(this, "BaseOpt", new NodeTypeName[] { ResolveTypeName(nodeTypeVariant.Variants[1].TypeFields[0].TypeId, types) });
+
             case "Void":
                return NodeTypeName.Base(this, "BaseVoid");
+
             default:
                break;
          }
@@ -276,7 +284,6 @@ private string ResolvePathInternal(string[] path, string prefix)
          return $"{ResolvePathInternal(previousElements, string.Empty)}.{prefix}{lastElement}";
       }
 
-
       private static void EnsureTypeIdsIsNotNull(uint[] typeIds)
       {
          if (typeIds == null || typeIds.Length == 0)
@@ -324,4 +331,4 @@ private string TypeNameSpace(string[] path)
          return path[0].MakeMethod();
       }
    }
-}
+}