Next ver 060 (#77)

* update next version * updating with new boilerplate
SubstrateGaming · Apr 2, 2024 · 0780832 · 0780832
1 parent 9c1d9b2
commit 0780832
Show file tree

Hide file tree

Showing 8 changed files with 115 additions and 59 deletions.
diff --git a/README.md b/README.md
@@ -56,9 +56,10 @@ Using a terminal of your choice, create a new directory for your project and exe
 ```sh
 dotnet new sln
 dotnet new substrate \
- --sdk_version 0.6.0 \
+ --sdk_version 0.6.1 \
  --rest_service PROJECTNAME.RestService \
  --net_api PROJECTNAME.NetApiExt \
+ --net_integration PROJECTNAME.Integration \
  --rest_client PROJECTNAME.RestClient \
  --metadata_websocket ws://127.0.0.1:9944 \
  --generate_openapi_documentation false \
@@ -75,6 +76,7 @@ which generates a new solution and a couple of .NET projects in your project dir
 ├─── .substrate
 ├─── .config
 ├─── PROJECTNAME.NetApiExt
+├─── PROJECTNAME.Integration
 ├─── PROJECTNAME.RestClient
 ├─── PROJECTNAME.RestClient.Mockup
 ├─── PROJECTNAME.RestClient.Test
@@ -125,9 +127,10 @@ You can also watch our short step-by-step tutorial that guides you through the e
  - AstarNET
  ```sh
  dotnet new substrate \
- --sdk_version 0.6.0 \  
+ --sdk_version 0.6.1 \  
  --rest_service AstarNET.RestService \  
  --net_api AstarNET.NetApiExt \  
+ --net_api AstarNET.Integration \ 
  --rest_client AstarNET.RestClient \  
  --metadata_websocket wss://rpc.astar.network \  
  --generate_openapi_documentation false \  

diff --git a/Tools/Substrate.DotNet.Template/templates/Substrate/.substrate/substrate-config.json b/Tools/Substrate.DotNet.Template/templates/Substrate/.substrate/substrate-config.json
@@ -1,6 +1,7 @@
 {
  "projects": {
  "net_api": "Substrate.NetApiExt",
+ "net_integration": "Substrate.Integration",
  "rest_service": "Substrate.RestService",
  "rest_client": "Substrate.RestClient"
  },

diff --git a/Tools/Substrate.DotNet.Template/templates/Substrate/.template.config/template.json b/Tools/Substrate.DotNet.Template/templates/Substrate/.template.config/template.json
@@ -9,60 +9,68 @@
  "language": "C#",
  "type": "project"
  },
- "symbols": {
- "sdk_version": {
- "datatype": "string",
- "defaultValue": "0.6.0",
- "description": "Uses the given Substrate .NET Toolchain version.",
- "replaces": "SUBSTRATE_TOOLCHAIN_VERSION",
- "type": "parameter"
- },
- "api_version": {
- "datatype": "string",
- "defaultValue": "0.9.20",
- "description": "Uses the given Substrate .NET API version.",
- "replaces": "SUBSTRATE_NETAPI_VERSION",
- "type": "parameter"
- },
- "net_api": {
- "datatype": "string",
- "defaultValue": "Substrate.NetApiExt",
- "description": "Renames project name and namespace containing Substrate.NetApiExt (default).",
- "fileRename": "Substrate.NetApiExt",
- "replaces": "Substrate.NetApiExt",
- "type": "parameter"
- },
- "rest_service": {
- "datatype": "string",
- "defaultValue": "Substrate.RestService",
- "description": "Renames project name and namespace containing Substrate.RestService (default).",
- "fileRename": "Substrate.RestService",
- "replaces": "Substrate.RestService",
- "type": "parameter"
- },
- "rest_client": {
- "datatype": "string",
- "defaultValue": "Substrate.RestClient",
- "description": "Renames project name and namespace containing Substrate.RestClient (default).",
- "fileRename": "Substrate.RestClient",
- "replaces": "Substrate.RestClient",
- "type": "parameter"
- },
- "metadata_websocket": {
- "datatype": "string",
- "defaultValue": "ws://127.0.0.1:9944",
- "description": "Uses the given websocket URL to query metadata.",
- "replaces": "ws://127.0.0.1:9944",
- "type": "parameter"
- },
- "generate_openapi_documentation": {
- "datatype": "bool",
- "defaultValue": "false",
- "description": "Activates/deactivates the OpenApi Document Generation",
- "replaces": "OPENAPI_DOCUMENTATION_ENABLED",
- "type": "parameter"
- }
- },
+ "symbols": {
+ "sdk_version": {
+ "datatype": "string",
+ "defaultValue": "0.6.1",
+ "description": "Uses the given Substrate .NET Toolchain version.",
+ "replaces": "SUBSTRATE_TOOLCHAIN_VERSION",
+ "type": "parameter"
+ },
+ "api_version": {
+ "datatype": "string",
+ "defaultValue": "0.9.20",
+ "description": "Uses the given Substrate .NET API version.",
+ "replaces": "SUBSTRATE_NETAPI_VERSION",
+ "type": "parameter"
+ },
+ "net_api": {
+ "datatype": "string",
+ "defaultValue": "Substrate.NetApiExt",
+ "description": "Renames project name and namespace containing Substrate.NetApiExt (default).",
+ "fileRename": "Substrate.NetApiExt",
+ "replaces": "Substrate.NetApiExt",
+ "type": "parameter"
+ },
+ "net_integration": {
+ "datatype": "string",
+ "defaultValue": "Substrate.Integration",
+ "description": "Renames project name and namespace containing Substrate.Integration (default).",
+ "fileRename": "Substrate.Integration",
+ "replaces": "Substrate.Integration",
+ "type": "parameter"
+ },
+ "rest_service": {
+ "datatype": "string",
+ "defaultValue": "Substrate.RestService",
+ "description": "Renames project name and namespace containing Substrate.RestService (default).",
+ "fileRename": "Substrate.RestService",
+ "replaces": "Substrate.RestService",
+ "type": "parameter"
+ },
+ "rest_client": {
+ "datatype": "string",
+ "defaultValue": "Substrate.RestClient",
+ "description": "Renames project name and namespace containing Substrate.RestClient (default).",
+ "fileRename": "Substrate.RestClient",
+ "replaces": "Substrate.RestClient",
+ "type": "parameter"
+ },
+ "metadata_websocket": {
+ "datatype": "string",
+ "defaultValue": "ws://127.0.0.1:9944",
+ "description": "Uses the given websocket URL to query metadata.",
+ "replaces": "ws://127.0.0.1:9944",
+ "type": "parameter"
+ },
+ "generate_openapi_documentation": {
+ "datatype": "bool",
+ "defaultValue": "false",
+ "description": "Activates/deactivates the OpenApi Document Generation",
+ "replaces": "OPENAPI_DOCUMENTATION_ENABLED",
+ "type": "parameter"
+ }
+ },
  "primaryOutputs": [
  { "path": "Substrate.RestService/Substrate.RestService.csproj" },
  { "path": "Substrate.NetApiExt/Substrate.NetApiExt.csproj" },

diff --git a/Tools/Substrate.DotNet/Constants.cs b/Tools/Substrate.DotNet/Constants.cs
@@ -3,7 +3,7 @@
  public static class Constants
  {
  public const string SubstrateNetApiNugetPackage = "Substrate.NetApi";
- public const string SubstrateServiceLayerNugetPackage = "Substrate.NetApi";
+ public const string SubstrateServiceLayerNugetPackage = "Substrate.ServiceLayer";
  public const string MicrosoftAspNetCoreMvcCoreNugetPackage = "Microsoft.AspNetCore.Mvc.Core";
  public const string SerilogAspNetCoreNugetPackage = "Serilog.AspNetCore";
  public const string SerilogEnrichersThreadNugetPackage = "Serilog.Enrichers.Thread";

diff --git a/Tools/Substrate.DotNet/Program.cs b/Tools/Substrate.DotNet/Program.cs
@@ -118,6 +118,7 @@ private static async Task<bool> UpgradeOrUpdateSubstrateEnvironmentAsync(bool fe
  }
 
  Log.Information("Using NetApi Project = {name}", configuration.Projects.NetApi);
+ Log.Information("Using Integration Project = {name}", configuration.Projects.Integration);
  Log.Information("Using RestService Project = {name}", configuration.Projects.RestService);
  Log.Information("Using RestClient Project = {name}", configuration.Projects.RestClient);
  Log.Information("Using RestClient.Mockup Project = {name}", configuration.Projects.RestClientMockup);
@@ -303,12 +304,25 @@ private static void GenerateRestClientClasses(SubstrateConfiguration configurati
  /// <summary>
  /// Generates all classes for the NetApi project
  /// </summary>
+ /// <param name="metadata"></param>
+ /// <param name="configuration"></param>
  private static void GenerateNetApiClasses(MetaData metadata, SubstrateConfiguration configuration)
  {
  var generator = new NetApiGenerator(Log.Logger, configuration.Metadata.Runtime, new ProjectSettings(configuration.Projects.NetApi));
  generator.Generate(metadata);
  }
 
+ /// <summary>
+ /// Generates all classes for the Integration project
+ /// </summary>
+ /// <param name="metadata"></param>
+ /// <param name="configuration"></param>
+ private static void GenerateIntegrationClasses(MetaData metadata, SubstrateConfiguration configuration)
+ {
+ var generator = new IntegrationGenerator(Log.Logger, configuration.Metadata.Runtime, new ProjectSettings(configuration.Projects.NetApi));
+ generator.Generate(metadata);
+ }
+
  /// <summary>
  /// Returns the directory path to .substrate directory
  /// </summary>

diff --git a/Tools/Substrate.DotNet/Service/Generators/IntegrationGenerator.cs b/Tools/Substrate.DotNet/Service/Generators/IntegrationGenerator.cs
@@ -0,0 +1,27 @@
+using Substrate.DotNet.Service.Generators.Base;
+using Substrate.DotNet.Service.Node;
+using Substrate.NetApi.Model.Meta;
+using Serilog;
+using System.Collections.Generic;
+
+namespace Substrate.DotNet.Service.Generators
+{
+ /// <summary>
+ /// Responsible for generating the NetApi Solution
+ /// </summary>
+ public class IntegrationGenerator : SolutionGeneratorBase
+ {
+ private readonly ProjectSettings _projectSettings;
+
+ public IntegrationGenerator(ILogger logger, string nodeRuntime, ProjectSettings projectSettings) : base(logger, nodeRuntime, projectSettings.ProjectName)
+ {
+ _projectSettings = projectSettings;
+ }
+
+ protected override void GenerateClasses(MetaData metadata)
+ {
+ GetGenericStructs(metadata.NodeMetadata.Types);
+ }
+
+ }
+}
diff --git a/Tools/Substrate.DotNet/SubstrateConfiguration.cs b/Tools/Substrate.DotNet/SubstrateConfiguration.cs
@@ -19,6 +19,9 @@ public class SubstrateConfigurationProjects
  [JsonProperty("net_api")]
  public string NetApi { get; set; }
 
+ [JsonProperty("net_integration")]
+ public string Integration { get; set; }
+
  [JsonProperty("rest_service")]
  public string RestService { get; set; }
 

diff --git a/Version.props b/Version.props
@@ -4,10 +4,10 @@
  <!-- Configuration -->
  <VersionMajor>0</VersionMajor>
  <VersionMinor>6</VersionMinor>
- <VersionPatch>0</VersionPatch>
+ <VersionPatch>1</VersionPatch>
  <AssemblyVersion>$(VersionMajor).$(VersionMinor).$(VersionPatch)</AssemblyVersion>
 
- <SubstratePackageVersion>0.6.0</SubstratePackageVersion>
+ <SubstratePackageVersion>0.6.1</SubstratePackageVersion>
 
  <!-- Variables -->
  <SubstrateVersion>$(AssemblyVersion)</SubstrateVersion>