Merge fac4fef into a39eeda

Crynners · Dec 10, 2021 · 5c4e960 · 5c4e960
2 parents a39eeda + fac4fef
commit 5c4e960
Show file tree

Hide file tree

Showing 11 changed files with 66 additions and 256 deletions.
diff --git a/CryptoBotCore.sln b/CryptoBotCore.sln
@@ -1,26 +1,26 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio Version 16
-VisualStudioVersion = 16.0.30717.126
+# Visual Studio Version 17
+VisualStudioVersion = 17.1.31911.260
 MinimumVisualStudioVersion = 10.0.40219.1
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "CryptoBotCore", "CryptoBotCore\CryptoBotCore.csproj", "{DA2615CF-76EF-4EF8-8AED-730533BD795E}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CryptoBotCore", "CryptoBotCore\CryptoBotCore.csproj", "{6F35ECF7-EF01-4473-A344-2FBD0C3D36D5}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "CryptoBotFunction", "CryptoBotFunction\CryptoBotFunction.csproj", "{8631C9AA-A4E5-4257-8BA2-8396CC698D7E}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CryptoBotFunction", "CryptoBotFunction\CryptoBotFunction.csproj", "{E6C11A63-713F-4653-9514-8A65ACDAF036}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
 		Release|Any CPU = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{DA2615CF-76EF-4EF8-8AED-730533BD795E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{DA2615CF-76EF-4EF8-8AED-730533BD795E}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{DA2615CF-76EF-4EF8-8AED-730533BD795E}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{DA2615CF-76EF-4EF8-8AED-730533BD795E}.Release|Any CPU.Build.0 = Release|Any CPU
-		{8631C9AA-A4E5-4257-8BA2-8396CC698D7E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{8631C9AA-A4E5-4257-8BA2-8396CC698D7E}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{8631C9AA-A4E5-4257-8BA2-8396CC698D7E}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{8631C9AA-A4E5-4257-8BA2-8396CC698D7E}.Release|Any CPU.Build.0 = Release|Any CPU
+		{6F35ECF7-EF01-4473-A344-2FBD0C3D36D5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{6F35ECF7-EF01-4473-A344-2FBD0C3D36D5}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{6F35ECF7-EF01-4473-A344-2FBD0C3D36D5}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{6F35ECF7-EF01-4473-A344-2FBD0C3D36D5}.Release|Any CPU.Build.0 = Release|Any CPU
+		{E6C11A63-713F-4653-9514-8A65ACDAF036}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{E6C11A63-713F-4653-9514-8A65ACDAF036}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{E6C11A63-713F-4653-9514-8A65ACDAF036}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{E6C11A63-713F-4653-9514-8A65ACDAF036}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE

diff --git a/CryptoBotCore/API/BitfinexAPI.cs b/CryptoBotCore/API/BitfinexAPI.cs
@@ -46,12 +46,12 @@ public BitfinexAPI(string pair, Dictionary<ExchangeCredentialType, string> crede
 
         private async Task<decimal> getCurrentPrice()
         {
-            var callResult = await client.GetTickerAsync();
+            var callResult = await client.GetTickerAsync($"{pair_base}{pair_quote}");
             // Make sure to check if the call was successful
             if (!callResult.Success)
             {
                 // Call failed, check callResult.Error for more info
-                throw new Exception(callResult.Error.Message);
+                throw new Exception(callResult?.Error?.Message);
             }
             else
             {

diff --git a/CryptoBotCore/AppSettings.json b/CryptoBotCore/AppSettings.json
diff --git a/CryptoBotCore/CryptoBotCore.csproj b/CryptoBotCore/CryptoBotCore.csproj
@@ -1,33 +1,35 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
-    <TargetFramework>netcoreapp3.1</TargetFramework>
+    <TargetFramework>net6.0</TargetFramework>
+    <ImplicitUsings>enable</ImplicitUsings>
+    <Nullable>enable</Nullable>
   </PropertyGroup>
 
-
-
   <ItemGroup>
-    <PackageReference Include="Binance.Net" Version="7.1.2" />
-    <PackageReference Include="Bitfinex.Net" Version="4.0.4" />
-    <PackageReference Include="Bittrex.Net" Version="6.0.5" />
-    <PackageReference Include="Coinbase" Version="6.0.1" />
-    <PackageReference Include="FTX.Net" Version="0.1.8" />
-    <PackageReference Include="Huobi.Net" Version="3.0.4" />
-    <PackageReference Include="KrakenExchange.Net" Version="2.0.8" />
-    <PackageReference Include="Kucoin.Net" Version="3.0.6" />
-    <PackageReference Include="Microsoft.Azure.Cosmos" Version="3.20.1" />
-    <PackageReference Include="Microsoft.Extensions.Configuration" Version="3.1.18" />
-    <PackageReference Include="Microsoft.Extensions.Hosting" Version="3.1.18" />
-    <PackageReference Include="Microsoft.Extensions.Hosting.Abstractions" Version="3.1.18" />
-    <PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
-    <PackageReference Include="Telegram.Bot" Version="16.0.2" />
+    <Content Include="..\..\..\..\.nuget\packages\microsoft.azure.cosmos\3.20.1\contentFiles\any\netstandard2.0\ThirdPartyNotice.txt" Link="ThirdPartyNotice.txt">
+      <Private>False</Private>
+      <NuGetPackageVersion>3.20.1</NuGetPackageVersion>
+      <NuGetItemType>Content</NuGetItemType>
+      <NuGetPackageId>Microsoft.Azure.Cosmos</NuGetPackageId>
+      <Pack>false</Pack>
+    </Content>
   </ItemGroup>
 
   <ItemGroup>
-    <None Update="AppSettings.json">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </None>
+    <PackageReference Include="Binance.Net" Version="7.2.6" />
+    <PackageReference Include="Bitfinex.Net" Version="4.2.4" />
+    <PackageReference Include="Bittrex.Net" Version="6.1.5" />
+    <PackageReference Include="Coinbase" Version="6.0.1" />
+    <PackageReference Include="FTX.Net" Version="0.1.9" />
+    <PackageReference Include="Huobi.Net" Version="3.2.4" />
+    <PackageReference Include="KrakenExchange.Net" Version="2.2.4" />
+    <PackageReference Include="Kucoin.Net" Version="3.1.6" />
+    <PackageReference Include="Microsoft.Azure.Cosmos" Version="3.23.0" />
+    <PackageReference Include="Microsoft.Extensions.Configuration" Version="6.0.0" />
+    <PackageReference Include="Microsoft.Extensions.Hosting" Version="6.0.0" />
+    <PackageReference Include="Microsoft.Extensions.Hosting.Abstractions" Version="6.0.0" />
+    <PackageReference Include="Telegram.Bot" Version="17.0.0" />
   </ItemGroup>
 
 </Project>
diff --git a/CryptoBotCore/Program.cs b/CryptoBotCore/Program.cs
diff --git a/CryptoBotCore/Utility.cs b/CryptoBotCore/Utility.cs
@@ -1,10 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace CryptoBotCore
+namespace CryptoBotCore
 {
     public static class Utility
     {

diff --git a/CryptoBotFunction/CryptoBotFunction.csproj b/CryptoBotFunction/CryptoBotFunction.csproj
@@ -1,49 +1,49 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFramework>netcoreapp3.1</TargetFramework>
-    <AzureFunctionsVersion>v3</AzureFunctionsVersion>
+    <TargetFramework>net6.0</TargetFramework>
+    <AzureFunctionsVersion>v4</AzureFunctionsVersion>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="Microsoft.NET.Sdk.Functions" Version="3.0.13" />
+    <PackageReference Include="Microsoft.NET.Sdk.Functions" Version="4.0.1" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\CryptoBotCore\CryptoBotCore.csproj" />
   </ItemGroup>
   <ItemGroup>
-    <None Update="bitfinex_variables.ps1">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </None>
-    <None Update="coinbase_variables.ps1">
+    <None Update="binance_variables.ps1">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </None>
-    <None Update="ftx_variables.ps1">
+    <None Update="bitfinex_variables.ps1">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </None>
     <None Update="bittrex_variables.ps1">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </None>
-    <None Update="kucoin_variables.ps1">
+    <None Update="coinbase_variables.ps1">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </None>
-    <None Update="kraken_variables.ps1">
+    <None Update="coinmate_variables.ps1">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </None>
-    <None Update="binance_variables.ps1">
+    <None Update="ftx_variables.ps1">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </None>
+    <None Update="host.json">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
     <None Update="huobi_variables.ps1">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </None>
-    <None Update="coinmate_variables.ps1">
+    <None Update="init_variables.ps1">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </None>
-    <None Update="host.json">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    <None Update="install_script.ps1">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </None>
-    <None Update="init_variables.ps1">
+    <None Update="kraken_variables.ps1">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </None>
-    <None Update="install_script.ps1">
+    <None Update="kucoin_variables.ps1">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </None>
     <None Update="local.settings.json">

diff --git a/CryptoBotFunction/Properties/ServiceDependencies/CrBts - Zip Deploy/profile.arm.json b/CryptoBotFunction/Properties/ServiceDependencies/CrBts - Zip Deploy/profile.arm.json
diff --git a/CryptoBotFunction/Properties/serviceDependencies.json b/CryptoBotFunction/Properties/serviceDependencies.json
@@ -2,6 +2,10 @@
   "dependencies": {
     "appInsights1": {
       "type": "appInsights"
+    },
+    "storage1": {
+      "type": "storage",
+      "connectionId": "AzureWebJobsStorage"
     }
   }
 }