Merge pull request #27 from SubstrateGaming/ver500_ajuna_bajun

added 0.6.5 and api 22-rc
SubstrateGaming · Jun 14, 2024 · 1cf2e73 · 1cf2e73
2 parents 4074106 + c8903b8
commit 1cf2e73
Show file tree

Hide file tree

Showing 16 changed files with 50 additions and 50 deletions.
diff --git a/Substrate.Ajuna.NET/.config/dotnet-tools.json b/Substrate.Ajuna.NET/.config/dotnet-tools.json
@@ -3,7 +3,7 @@
   "isRoot": true,
   "tools": {
     "substrate.dotnet": {
-      "version": "0.6.4",
+      "version": "0.6.5",
       "commands": [
         "substrate"
       ]

diff --git a/Substrate.Ajuna.NET/Substrate.Ajuna.NET.Integration/NET/Integration/Client/BaseClient.cs b/Substrate.Ajuna.NET/Substrate.Ajuna.NET.Integration/NET/Integration/Client/BaseClient.cs
@@ -90,7 +90,7 @@ public async Task<bool> ConnectAsync(bool useMetadata, bool standardSubstrate, C
                 }
                 catch (Exception e)
                 {
-                    Log.Error("BaseClient.ConnectAsync: 0",
+                    Log.Error("BaseClient.ConnectAsync: {0}",
                         e.ToString());
                 }
             }
@@ -162,13 +162,13 @@ public async Task<string> GenericExtrinsicAsync(Account account, string extrinsi
 
             if (HasMaxConcurentTaskRunning())
             {
-                Log.Warning("There can not be more then 0 concurrent tasks overall!", _maxConcurrentCalls);
+                Log.Warning("There can not be more then {0} concurrent tasks overall!", _maxConcurrentCalls);
                 return null;
             }
 
             if (HasToManyConcurentTaskRunning(extrinsicType, concurrentTasks))
             {
-                Log.Warning("There can not be more then 0 concurrent tasks of 1!", concurrentTasks, extrinsicType);
+                Log.Warning("There can not be more then {0} concurrent tasks of {1}!", concurrentTasks, extrinsicType);
                 return null;
             }
 
@@ -179,7 +179,7 @@ public async Task<string> GenericExtrinsicAsync(Account account, string extrinsi
             }
             catch (RemoteInvocationException e)
             {
-                Log.Error("RemoteInvocationException: 0", e.Message);
+                Log.Error("RemoteInvocationException: {0}", e.Message);
                 return subscription;
             }
 
@@ -188,15 +188,15 @@ public async Task<string> GenericExtrinsicAsync(Account account, string extrinsi
                 return null;
             }
 
-            Log.Debug("Generic extrinsic sent 0 with 1.", extrinsicMethod.ModuleName + "_" + extrinsicMethod.CallName, subscription);
+            Log.Debug("Generic extrinsic sent {0} with {1}.", extrinsicMethod.ModuleName + "_" + extrinsicMethod.CallName, subscription);
 
             if (ExtrinsicManager.TryAdd(subscription, extrinsicType))
             {
-                Log.Debug("Generic extrinsic sent 0 with 1.", extrinsicMethod.ModuleName + "_" + extrinsicMethod.CallName, subscription);
+                Log.Debug("Generic extrinsic sent {0} with {1}.", extrinsicMethod.ModuleName + "_" + extrinsicMethod.CallName, subscription);
             }
             else
             {
-                Log.Warning("ExtrinsicManager.Add failed for 0 with 1.", extrinsicMethod.ModuleName + "_" + extrinsicMethod.CallName, subscription);
+                Log.Warning("ExtrinsicManager.Add failed for {0} with {1}.", extrinsicMethod.ModuleName + "_" + extrinsicMethod.CallName, subscription);
             }
 
             return subscription;
@@ -237,7 +237,7 @@ public async void ActionExtrinsicUpdate(string subscriptionId, TransactionEventI
             }
             catch (Exception ex)
             {
-                Log.Warning("ActionExtrinsicUpdate: 0", ex.Message);
+                Log.Warning("ActionExtrinsicUpdate: {0}", ex.Message);
             }
         }
 
@@ -268,7 +268,7 @@ public async Task<string> SubscribeEventsAsync(CancellationToken token)
 
             SubscriptionManager.IsSubscribed = true;
 
-            Log.Debug("SystemStorage.Events subscription id [0] registred.", subscription);
+            Log.Debug("SystemStorage.Events subscription id [{0}] registred.", subscription);
 
             return subscription;
          }

diff --git a/Substrate.Ajuna.NET/Substrate.Ajuna.NET.NetApiExt/NET/NetApiExt/Client/BaseClient.cs b/Substrate.Ajuna.NET/Substrate.Ajuna.NET.NetApiExt/NET/NetApiExt/Client/BaseClient.cs
@@ -90,7 +90,7 @@ public async Task<bool> ConnectAsync(bool useMetadata, bool standardSubstrate, C
                 }
                 catch (Exception e)
                 {
-                    Log.Error("BaseClient.ConnectAsync: 0",
+                    Log.Error("BaseClient.ConnectAsync: {0}",
                         e.ToString());
                 }
             }
@@ -162,13 +162,13 @@ public async Task<string> GenericExtrinsicAsync(Account account, string extrinsi
 
             if (HasMaxConcurentTaskRunning())
             {
-                Log.Warning("There can not be more then 0 concurrent tasks overall!", _maxConcurrentCalls);
+                Log.Warning("There can not be more then {0} concurrent tasks overall!", _maxConcurrentCalls);
                 return null;
             }
 
             if (HasToManyConcurentTaskRunning(extrinsicType, concurrentTasks))
             {
-                Log.Warning("There can not be more then 0 concurrent tasks of 1!", concurrentTasks, extrinsicType);
+                Log.Warning("There can not be more then {0} concurrent tasks of {1}!", concurrentTasks, extrinsicType);
                 return null;
             }
 
@@ -179,7 +179,7 @@ public async Task<string> GenericExtrinsicAsync(Account account, string extrinsi
             }
             catch (RemoteInvocationException e)
             {
-                Log.Error("RemoteInvocationException: 0", e.Message);
+                Log.Error("RemoteInvocationException: {0}", e.Message);
                 return subscription;
             }
 
@@ -188,15 +188,15 @@ public async Task<string> GenericExtrinsicAsync(Account account, string extrinsi
                 return null;
             }
 
-            Log.Debug("Generic extrinsic sent 0 with 1.", extrinsicMethod.ModuleName + "_" + extrinsicMethod.CallName, subscription);
+            Log.Debug("Generic extrinsic sent {0} with {1}.", extrinsicMethod.ModuleName + "_" + extrinsicMethod.CallName, subscription);
 
             if (ExtrinsicManager.TryAdd(subscription, extrinsicType))
             {
-                Log.Debug("Generic extrinsic sent 0 with 1.", extrinsicMethod.ModuleName + "_" + extrinsicMethod.CallName, subscription);
+                Log.Debug("Generic extrinsic sent {0} with {1}.", extrinsicMethod.ModuleName + "_" + extrinsicMethod.CallName, subscription);
             }
             else
             {
-                Log.Warning("ExtrinsicManager.Add failed for 0 with 1.", extrinsicMethod.ModuleName + "_" + extrinsicMethod.CallName, subscription);
+                Log.Warning("ExtrinsicManager.Add failed for {0} with {1}.", extrinsicMethod.ModuleName + "_" + extrinsicMethod.CallName, subscription);
             }
 
             return subscription;
@@ -237,7 +237,7 @@ public async void ActionExtrinsicUpdate(string subscriptionId, TransactionEventI
             }
             catch (Exception ex)
             {
-                Log.Warning("ActionExtrinsicUpdate: 0", ex.Message);
+                Log.Warning("ActionExtrinsicUpdate: {0}", ex.Message);
             }
         }
 
@@ -268,7 +268,7 @@ public async Task<string> SubscribeEventsAsync(CancellationToken token)
 
             SubscriptionManager.IsSubscribed = true;
 
-            Log.Debug("SystemStorage.Events subscription id [0] registred.", subscription);
+            Log.Debug("SystemStorage.Events subscription id [{0}] registred.", subscription);
 
             return subscription;
          }

diff --git a/Substrate.Ajuna.NET/Substrate.Ajuna.NET.NetApiExt/Substrate.Ajuna.NET.NetApiExt.csproj b/Substrate.Ajuna.NET/Substrate.Ajuna.NET.NetApiExt/Substrate.Ajuna.NET.NetApiExt.csproj
@@ -3,7 +3,7 @@
 	<PropertyGroup>
 		<PackageId>Substrate.Ajuna.NET.Extension</PackageId>
 		<TargetFrameworks>netstandard2.0;netstandard2.1;net6.0</TargetFrameworks>
-		<Version>1.500.0</Version>
+		<Version>1.500.1</Version>
 		<Company>Substrate Gaming</Company>
 		<Authors>Substrate Gaming</Authors>
 		<GeneratePackageOnBuild>true</GeneratePackageOnBuild>

diff --git a/...na.NET/Substrate.Ajuna.NET.RestClient.Mockup/Substrate.Ajuna.NET.RestClient.Mockup.csproj b/...na.NET/Substrate.Ajuna.NET.RestClient.Mockup/Substrate.Ajuna.NET.RestClient.Mockup.csproj
@@ -3,7 +3,7 @@
       <TargetFramework>netstandard2.0</TargetFramework>
    </PropertyGroup>
    <ItemGroup>
-      <PackageReference Include="Substrate.ServiceLayer.Model" Version="0.6.4" />
+      <PackageReference Include="Substrate.ServiceLayer.Model" Version="0.6.5" />
    </ItemGroup>
    <ItemGroup>      
       <ProjectReference Include="..\Substrate.Ajuna.NET.RestClient\Substrate.Ajuna.NET.RestClient.csproj" />

diff --git a/....Ajuna.NET/Substrate.Ajuna.NET.RestClient.Test/Substrate.Ajuna.NET.RestClient.Test.csproj b/....Ajuna.NET/Substrate.Ajuna.NET.RestClient.Test/Substrate.Ajuna.NET.RestClient.Test.csproj
@@ -11,7 +11,7 @@
 	</ItemGroup>
 
    <ItemGroup>
-      <PackageReference Include="Substrate.ServiceLayer.Model" Version="0.6.4" />
+      <PackageReference Include="Substrate.ServiceLayer.Model" Version="0.6.5" />
    </ItemGroup>
 
    <ItemGroup>      

diff --git a/Substrate.Ajuna.NET/Substrate.Ajuna.NET.RestClient/Substrate.Ajuna.NET.RestClient.csproj b/Substrate.Ajuna.NET/Substrate.Ajuna.NET.RestClient/Substrate.Ajuna.NET.RestClient.csproj
@@ -11,7 +11,7 @@
    </PropertyGroup>
 
    <ItemGroup>
-      <PackageReference Include="Substrate.ServiceLayer.Model" Version="0.6.4" />
+      <PackageReference Include="Substrate.ServiceLayer.Model" Version="0.6.5" />
    </ItemGroup>
    <ItemGroup>
       <ProjectReference Include="..\Substrate.Ajuna.NET.NetApiExt\Substrate.Ajuna.NET.NetApiExt.csproj" />

diff --git a/Substrate.Ajuna.NET/Substrate.Ajuna.NET.RestService/Substrate.Ajuna.NET.RestService.csproj b/Substrate.Ajuna.NET/Substrate.Ajuna.NET.RestService/Substrate.Ajuna.NET.RestService.csproj
@@ -17,8 +17,8 @@
       <PackageReference Include="Serilog.AspNetCore" Version="4.1.0" />
       <PackageReference Include="Serilog.Enrichers.Thread" Version="3.1.0" />
       <PackageReference Include="Swashbuckle.AspNetCore" Version="6.2.2" />
-      <PackageReference Include="Substrate.AspNetCore" Version="0.6.4" />
-      <PackageReference Include="Substrate.ServiceLayer" Version="0.6.4" />
+      <PackageReference Include="Substrate.AspNetCore" Version="0.6.5" />
+      <PackageReference Include="Substrate.ServiceLayer" Version="0.6.5" />
    </ItemGroup>
 
    <ItemGroup>

diff --git a/Substrate.Bajun.NET/.config/dotnet-tools.json b/Substrate.Bajun.NET/.config/dotnet-tools.json
@@ -3,7 +3,7 @@
   "isRoot": true,
   "tools": {
     "substrate.dotnet": {
-      "version": "0.6.4",
+      "version": "0.6.5",
       "commands": [
         "substrate"
       ]

diff --git a/Substrate.Bajun.NET/Substrate.Bajun.NET.Integration/NET/Integration/Client/BaseClient.cs b/Substrate.Bajun.NET/Substrate.Bajun.NET.Integration/NET/Integration/Client/BaseClient.cs
@@ -90,7 +90,7 @@ public async Task<bool> ConnectAsync(bool useMetadata, bool standardSubstrate, C
                 }
                 catch (Exception e)
                 {
-                    Log.Error("BaseClient.ConnectAsync: 0",
+                    Log.Error("BaseClient.ConnectAsync: {0}",
                         e.ToString());
                 }
             }
@@ -162,13 +162,13 @@ public async Task<string> GenericExtrinsicAsync(Account account, string extrinsi
 
             if (HasMaxConcurentTaskRunning())
             {
-                Log.Warning("There can not be more then 0 concurrent tasks overall!", _maxConcurrentCalls);
+                Log.Warning("There can not be more then {0} concurrent tasks overall!", _maxConcurrentCalls);
                 return null;
             }
 
             if (HasToManyConcurentTaskRunning(extrinsicType, concurrentTasks))
             {
-                Log.Warning("There can not be more then 0 concurrent tasks of 1!", concurrentTasks, extrinsicType);
+                Log.Warning("There can not be more then {0} concurrent tasks of {1}!", concurrentTasks, extrinsicType);
                 return null;
             }
 
@@ -179,7 +179,7 @@ public async Task<string> GenericExtrinsicAsync(Account account, string extrinsi
             }
             catch (RemoteInvocationException e)
             {
-                Log.Error("RemoteInvocationException: 0", e.Message);
+                Log.Error("RemoteInvocationException: {0}", e.Message);
                 return subscription;
             }
 
@@ -188,15 +188,15 @@ public async Task<string> GenericExtrinsicAsync(Account account, string extrinsi
                 return null;
             }
 
-            Log.Debug("Generic extrinsic sent 0 with 1.", extrinsicMethod.ModuleName + "_" + extrinsicMethod.CallName, subscription);
+            Log.Debug("Generic extrinsic sent {0} with {1}.", extrinsicMethod.ModuleName + "_" + extrinsicMethod.CallName, subscription);
 
             if (ExtrinsicManager.TryAdd(subscription, extrinsicType))
             {
-                Log.Debug("Generic extrinsic sent 0 with 1.", extrinsicMethod.ModuleName + "_" + extrinsicMethod.CallName, subscription);
+                Log.Debug("Generic extrinsic sent {0} with {1}.", extrinsicMethod.ModuleName + "_" + extrinsicMethod.CallName, subscription);
             }
             else
             {
-                Log.Warning("ExtrinsicManager.Add failed for 0 with 1.", extrinsicMethod.ModuleName + "_" + extrinsicMethod.CallName, subscription);
+                Log.Warning("ExtrinsicManager.Add failed for {0} with {1}.", extrinsicMethod.ModuleName + "_" + extrinsicMethod.CallName, subscription);
             }
 
             return subscription;
@@ -237,7 +237,7 @@ public async void ActionExtrinsicUpdate(string subscriptionId, TransactionEventI
             }
             catch (Exception ex)
             {
-                Log.Warning("ActionExtrinsicUpdate: 0", ex.Message);
+                Log.Warning("ActionExtrinsicUpdate: {0}", ex.Message);
             }
         }
 
@@ -268,7 +268,7 @@ public async Task<string> SubscribeEventsAsync(CancellationToken token)
 
             SubscriptionManager.IsSubscribed = true;
 
-            Log.Debug("SystemStorage.Events subscription id [0] registred.", subscription);
+            Log.Debug("SystemStorage.Events subscription id [{0}] registred.", subscription);
 
             return subscription;
          }

diff --git a/Substrate.Bajun.NET/Substrate.Bajun.NET.NetApiExt/NET/NetApiExt/Client/BaseClient.cs b/Substrate.Bajun.NET/Substrate.Bajun.NET.NetApiExt/NET/NetApiExt/Client/BaseClient.cs
@@ -90,7 +90,7 @@ public async Task<bool> ConnectAsync(bool useMetadata, bool standardSubstrate, C
                 }
                 catch (Exception e)
                 {
-                    Log.Error("BaseClient.ConnectAsync: 0",
+                    Log.Error("BaseClient.ConnectAsync: {0}",
                         e.ToString());
                 }
             }
@@ -162,13 +162,13 @@ public async Task<string> GenericExtrinsicAsync(Account account, string extrinsi
 
             if (HasMaxConcurentTaskRunning())
             {
-                Log.Warning("There can not be more then 0 concurrent tasks overall!", _maxConcurrentCalls);
+                Log.Warning("There can not be more then {0} concurrent tasks overall!", _maxConcurrentCalls);
                 return null;
             }
 
             if (HasToManyConcurentTaskRunning(extrinsicType, concurrentTasks))
             {
-                Log.Warning("There can not be more then 0 concurrent tasks of 1!", concurrentTasks, extrinsicType);
+                Log.Warning("There can not be more then {0} concurrent tasks of {1}!", concurrentTasks, extrinsicType);
                 return null;
             }
 
@@ -179,7 +179,7 @@ public async Task<string> GenericExtrinsicAsync(Account account, string extrinsi
             }
             catch (RemoteInvocationException e)
             {
-                Log.Error("RemoteInvocationException: 0", e.Message);
+                Log.Error("RemoteInvocationException: {0}", e.Message);
                 return subscription;
             }
 
@@ -188,15 +188,15 @@ public async Task<string> GenericExtrinsicAsync(Account account, string extrinsi
                 return null;
             }
 
-            Log.Debug("Generic extrinsic sent 0 with 1.", extrinsicMethod.ModuleName + "_" + extrinsicMethod.CallName, subscription);
+            Log.Debug("Generic extrinsic sent {0} with {1}.", extrinsicMethod.ModuleName + "_" + extrinsicMethod.CallName, subscription);
 
             if (ExtrinsicManager.TryAdd(subscription, extrinsicType))
             {
-                Log.Debug("Generic extrinsic sent 0 with 1.", extrinsicMethod.ModuleName + "_" + extrinsicMethod.CallName, subscription);
+                Log.Debug("Generic extrinsic sent {0} with {1}.", extrinsicMethod.ModuleName + "_" + extrinsicMethod.CallName, subscription);
             }
             else
             {
-                Log.Warning("ExtrinsicManager.Add failed for 0 with 1.", extrinsicMethod.ModuleName + "_" + extrinsicMethod.CallName, subscription);
+                Log.Warning("ExtrinsicManager.Add failed for {0} with {1}.", extrinsicMethod.ModuleName + "_" + extrinsicMethod.CallName, subscription);
             }
 
             return subscription;
@@ -237,7 +237,7 @@ public async void ActionExtrinsicUpdate(string subscriptionId, TransactionEventI
             }
             catch (Exception ex)
             {
-                Log.Warning("ActionExtrinsicUpdate: 0", ex.Message);
+                Log.Warning("ActionExtrinsicUpdate: {0}", ex.Message);
             }
         }
 
@@ -268,7 +268,7 @@ public async Task<string> SubscribeEventsAsync(CancellationToken token)
 
             SubscriptionManager.IsSubscribed = true;
 
-            Log.Debug("SystemStorage.Events subscription id [0] registred.", subscription);
+            Log.Debug("SystemStorage.Events subscription id [{0}] registred.", subscription);
 
             return subscription;
          }

diff --git a/Substrate.Bajun.NET/Substrate.Bajun.NET.NetApiExt/Substrate.Bajun.NET.NetApiExt.csproj b/Substrate.Bajun.NET/Substrate.Bajun.NET.NetApiExt/Substrate.Bajun.NET.NetApiExt.csproj
@@ -3,7 +3,7 @@
 	<PropertyGroup>
 		<PackageId>Substrate.Bajun.NET.Extension</PackageId>
 		<TargetFrameworks>netstandard2.0;netstandard2.1;net6.0</TargetFrameworks>
-		<Version>1.500.0</Version>
+		<Version>1.500.1</Version>
 		<Company>Substrate Gaming</Company>
 		<Authors>Substrate Gaming</Authors>
 		<GeneratePackageOnBuild>true</GeneratePackageOnBuild>

diff --git a/...un.NET/Substrate.Bajun.NET.RestClient.Mockup/Substrate.Bajun.NET.RestClient.Mockup.csproj b/...un.NET/Substrate.Bajun.NET.RestClient.Mockup/Substrate.Bajun.NET.RestClient.Mockup.csproj
@@ -3,7 +3,7 @@
       <TargetFramework>netstandard2.0</TargetFramework>
    </PropertyGroup>
    <ItemGroup>
-      <PackageReference Include="Substrate.ServiceLayer.Model" Version="0.6.4" />
+      <PackageReference Include="Substrate.ServiceLayer.Model" Version="0.6.5" />
    </ItemGroup>
    <ItemGroup>      
       <ProjectReference Include="..\Substrate.Bajun.NET.RestClient\Substrate.Bajun.NET.RestClient.csproj" />

diff --git a/....Bajun.NET/Substrate.Bajun.NET.RestClient.Test/Substrate.Bajun.NET.RestClient.Test.csproj b/....Bajun.NET/Substrate.Bajun.NET.RestClient.Test/Substrate.Bajun.NET.RestClient.Test.csproj
@@ -11,7 +11,7 @@
 	</ItemGroup>
 
    <ItemGroup>
-      <PackageReference Include="Substrate.ServiceLayer.Model" Version="0.6.4" />
+      <PackageReference Include="Substrate.ServiceLayer.Model" Version="0.6.5" />
    </ItemGroup>
 
    <ItemGroup>      

diff --git a/Substrate.Bajun.NET/Substrate.Bajun.NET.RestClient/Substrate.Bajun.NET.RestClient.csproj b/Substrate.Bajun.NET/Substrate.Bajun.NET.RestClient/Substrate.Bajun.NET.RestClient.csproj
@@ -11,7 +11,7 @@
    </PropertyGroup>
 
    <ItemGroup>
-      <PackageReference Include="Substrate.ServiceLayer.Model" Version="0.6.4" />
+      <PackageReference Include="Substrate.ServiceLayer.Model" Version="0.6.5" />
    </ItemGroup>
    <ItemGroup>
       <ProjectReference Include="..\Substrate.Bajun.NET.NetApiExt\Substrate.Bajun.NET.NetApiExt.csproj" />

diff --git a/Substrate.Bajun.NET/Substrate.Bajun.NET.RestService/Substrate.Bajun.NET.RestService.csproj b/Substrate.Bajun.NET/Substrate.Bajun.NET.RestService/Substrate.Bajun.NET.RestService.csproj
@@ -17,8 +17,8 @@
       <PackageReference Include="Serilog.AspNetCore" Version="4.1.0" />
       <PackageReference Include="Serilog.Enrichers.Thread" Version="3.1.0" />
       <PackageReference Include="Swashbuckle.AspNetCore" Version="6.2.2" />
-      <PackageReference Include="Substrate.AspNetCore" Version="0.6.4" />
-      <PackageReference Include="Substrate.ServiceLayer" Version="0.6.4" />
+      <PackageReference Include="Substrate.AspNetCore" Version="0.6.5" />
+      <PackageReference Include="Substrate.ServiceLayer" Version="0.6.5" />
    </ItemGroup>
 
    <ItemGroup>