chore: bumps netezos version

bender-labs · Feb 25, 2021 · c783721 · c783721
1 parent 323fa79
commit c783721
Show file tree

Hide file tree

Showing 8 changed files with 378 additions and 325 deletions.
diff --git a/paket.dependencies b/paket.dependencies
@@ -10,7 +10,7 @@ nuget FsUnit.xUnit 4.0.1
 nuget Giraffe 5.0.0-alpha-003 alpha
 nuget Microsoft.Extensions.Hosting.WindowsServices 3.1.9
 nuget Microsoft.NET.Test.Sdk 16.7.1
-nuget Netezos.rpc 1.1.2
+nuget Netezos 2.2.1
 nuget System.Net.NameResolution 4.3.0
 nuget xunit.runner.visualstudio 2.4.3
 nuget Microsoft.SourceLink.GitHub 1.0.0 copy_local: true

diff --git a/paket.lock b/paket.lock
diff --git a/src/TzWatch.Http/TzWatch.Http.fsproj b/src/TzWatch.Http/TzWatch.Http.fsproj
@@ -15,10 +15,6 @@
     <Compile Include="Program\MainLoop.fs" />
     <Compile Include="Adapters\Json.fs" />
     <Compile Include="Program.fs" />
-    <Content Include="appsettings.Development.json">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
-    <Content Include="Properties\launchSettings.json" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\TzWatch.Lib\TzWatch.Lib.fsproj" />

diff --git a/src/TzWatch.Http/appsettings.Development.json b/src/TzWatch.Http/appsettings.Development.json
@@ -7,8 +7,8 @@
         }
     },
     "TezosNode": {
-        "ChainId": "NetXm8tYqnMWky1",
-        "Endpoint": "https://testnet-tezos.giganode.io",
+        "ChainId": "NetXSgo1ZT2DRUG",
+        "Endpoint": "https://edonet-tezos.giganode.io",
         "Timeout": 60
     }
 }
diff --git a/src/TzWatch.Lib/Domain/Types.fs b/src/TzWatch.Lib/Domain/Types.fs
@@ -1,13 +1,12 @@
 namespace TzWatch.Domain
 
 open System
+open Newtonsoft.Json.Linq
 
 [<AutoOpen>]
 module Types =
 
-    open System.Reactive.Subjects
     open FSharp.Control
-    open Newtonsoft.Json.Linq
 
     type Block = {
         Level: int

diff --git a/src/TzWatch.Lib/Sync/Poller.fs b/src/TzWatch.Lib/Sync/Poller.fs
@@ -4,6 +4,7 @@ open System
 open FSharp.Control
 open FSharpx.Control
 open Netezos.Rpc
+open Newtonsoft.Json.Linq
 open TzWatch.Domain
 open TzWatch.Node.Types
 
@@ -19,7 +20,6 @@ type SyncNode(node: TezosRpc, chainId: string) =
                         node.Blocks.Head.Header.GetAsync()
                         |> Async.AwaitTask
 
-
                     let header = Header.Parse(head.ToString())
                     if header.ChainId <> chainId then failwith "Invalid Chain"
                     let headLevel = header.Level
@@ -37,6 +37,7 @@ type SyncNode(node: TezosRpc, chainId: string) =
                             node.Blocks.[actualLevel].Operations.[3]
                                 .GetAsync()
                             |> Async.AwaitTask
+                            |> Async.map (fun v -> JToken.Parse(v.ToString()))
 
                         let! blockHeader =
                             node.Blocks.[actualLevel].Header.GetAsync()

diff --git a/src/TzWatch.Lib/paket.references b/src/TzWatch.Lib/paket.references
@@ -1,7 +1,8 @@
 FSharp.Data
-Netezos.rpc
 FSharp.Core
 FSharpx.Extras
 FSharp.Control.Reactive
 FsToolkit.ErrorHandling
-Microsoft.SourceLink.GitHub
+Microsoft.SourceLink.GitHub
+Netezos
+Newtonsoft.Json
diff --git a/tz-watch.sln b/tz-watch.sln
@@ -3,20 +3,15 @@ Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio 15
 VisualStudioVersion = 15.0.26124.0
 MinimumVisualStudioVersion = 15.0.26124.0
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = ".paket", ".paket", "{E25B37FC-C231-4D13-97CF-262BA40A5436}"
-	ProjectSection(SolutionItems) = preProject
-		paket.dependencies = paket.dependencies
-	EndProjectSection
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{4A009A29-97B8-43C1-AD8E-6CCDF20D62DF}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{9B70EE8D-3AFA-4978-B672-7E5D013A6446}"
+Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "TzWatch.Lib", "src\TzWatch.Lib\TzWatch.Lib.fsproj", "{FB00451C-8073-4FD8-8AD8-DCACADAD974D}"
 EndProject
-Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "TzWatch.Http", "src\TzWatch.Http\TzWatch.Http.fsproj", "{C3510461-A00E-4D02-9B43-CC219FA803CB}"
+Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "TzWatch.Http", "src\TzWatch.Http\TzWatch.Http.fsproj", "{BC329A76-F079-4CFE-A5C9-EB5B1FEB0C1D}"
 EndProject
-Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "TzWatch.Lib", "src\TzWatch.Lib\TzWatch.Lib.fsproj", "{568F72EF-24D4-4DE8-A4AC-2936CEDC8239}"
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{80B379AD-773A-4072-93DF-B7F81B596BBE}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{E7AF7A6B-F7C4-4D1A-9166-E3FA2EC7A5BB}"
-EndProject
-Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "TzWatch.Test", "tests\TzWatch.Test\TzWatch.Test.fsproj", "{6BAC9990-5BFE-49A2-B6F6-BEDF477549B1}"
+Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "TzWatch.Test", "tests\TzWatch.Test\TzWatch.Test.fsproj", "{26B9C63A-3900-4D49-A7D7-3124CC1B02B3}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -31,46 +26,46 @@ Global
 		HideSolutionNode = FALSE
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{C3510461-A00E-4D02-9B43-CC219FA803CB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{C3510461-A00E-4D02-9B43-CC219FA803CB}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{C3510461-A00E-4D02-9B43-CC219FA803CB}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{C3510461-A00E-4D02-9B43-CC219FA803CB}.Debug|x64.Build.0 = Debug|Any CPU
-		{C3510461-A00E-4D02-9B43-CC219FA803CB}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{C3510461-A00E-4D02-9B43-CC219FA803CB}.Debug|x86.Build.0 = Debug|Any CPU
-		{C3510461-A00E-4D02-9B43-CC219FA803CB}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{C3510461-A00E-4D02-9B43-CC219FA803CB}.Release|Any CPU.Build.0 = Release|Any CPU
-		{C3510461-A00E-4D02-9B43-CC219FA803CB}.Release|x64.ActiveCfg = Release|Any CPU
-		{C3510461-A00E-4D02-9B43-CC219FA803CB}.Release|x64.Build.0 = Release|Any CPU
-		{C3510461-A00E-4D02-9B43-CC219FA803CB}.Release|x86.ActiveCfg = Release|Any CPU
-		{C3510461-A00E-4D02-9B43-CC219FA803CB}.Release|x86.Build.0 = Release|Any CPU
-		{568F72EF-24D4-4DE8-A4AC-2936CEDC8239}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{568F72EF-24D4-4DE8-A4AC-2936CEDC8239}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{568F72EF-24D4-4DE8-A4AC-2936CEDC8239}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{568F72EF-24D4-4DE8-A4AC-2936CEDC8239}.Debug|x64.Build.0 = Debug|Any CPU
-		{568F72EF-24D4-4DE8-A4AC-2936CEDC8239}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{568F72EF-24D4-4DE8-A4AC-2936CEDC8239}.Debug|x86.Build.0 = Debug|Any CPU
-		{568F72EF-24D4-4DE8-A4AC-2936CEDC8239}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{568F72EF-24D4-4DE8-A4AC-2936CEDC8239}.Release|Any CPU.Build.0 = Release|Any CPU
-		{568F72EF-24D4-4DE8-A4AC-2936CEDC8239}.Release|x64.ActiveCfg = Release|Any CPU
-		{568F72EF-24D4-4DE8-A4AC-2936CEDC8239}.Release|x64.Build.0 = Release|Any CPU
-		{568F72EF-24D4-4DE8-A4AC-2936CEDC8239}.Release|x86.ActiveCfg = Release|Any CPU
-		{568F72EF-24D4-4DE8-A4AC-2936CEDC8239}.Release|x86.Build.0 = Release|Any CPU
-		{6BAC9990-5BFE-49A2-B6F6-BEDF477549B1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{6BAC9990-5BFE-49A2-B6F6-BEDF477549B1}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{6BAC9990-5BFE-49A2-B6F6-BEDF477549B1}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{6BAC9990-5BFE-49A2-B6F6-BEDF477549B1}.Debug|x64.Build.0 = Debug|Any CPU
-		{6BAC9990-5BFE-49A2-B6F6-BEDF477549B1}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{6BAC9990-5BFE-49A2-B6F6-BEDF477549B1}.Debug|x86.Build.0 = Debug|Any CPU
-		{6BAC9990-5BFE-49A2-B6F6-BEDF477549B1}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{6BAC9990-5BFE-49A2-B6F6-BEDF477549B1}.Release|Any CPU.Build.0 = Release|Any CPU
-		{6BAC9990-5BFE-49A2-B6F6-BEDF477549B1}.Release|x64.ActiveCfg = Release|Any CPU
-		{6BAC9990-5BFE-49A2-B6F6-BEDF477549B1}.Release|x64.Build.0 = Release|Any CPU
-		{6BAC9990-5BFE-49A2-B6F6-BEDF477549B1}.Release|x86.ActiveCfg = Release|Any CPU
-		{6BAC9990-5BFE-49A2-B6F6-BEDF477549B1}.Release|x86.Build.0 = Release|Any CPU
+		{FB00451C-8073-4FD8-8AD8-DCACADAD974D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{FB00451C-8073-4FD8-8AD8-DCACADAD974D}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{FB00451C-8073-4FD8-8AD8-DCACADAD974D}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{FB00451C-8073-4FD8-8AD8-DCACADAD974D}.Debug|x64.Build.0 = Debug|Any CPU
+		{FB00451C-8073-4FD8-8AD8-DCACADAD974D}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{FB00451C-8073-4FD8-8AD8-DCACADAD974D}.Debug|x86.Build.0 = Debug|Any CPU
+		{FB00451C-8073-4FD8-8AD8-DCACADAD974D}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{FB00451C-8073-4FD8-8AD8-DCACADAD974D}.Release|Any CPU.Build.0 = Release|Any CPU
+		{FB00451C-8073-4FD8-8AD8-DCACADAD974D}.Release|x64.ActiveCfg = Release|Any CPU
+		{FB00451C-8073-4FD8-8AD8-DCACADAD974D}.Release|x64.Build.0 = Release|Any CPU
+		{FB00451C-8073-4FD8-8AD8-DCACADAD974D}.Release|x86.ActiveCfg = Release|Any CPU
+		{FB00451C-8073-4FD8-8AD8-DCACADAD974D}.Release|x86.Build.0 = Release|Any CPU
+		{BC329A76-F079-4CFE-A5C9-EB5B1FEB0C1D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{BC329A76-F079-4CFE-A5C9-EB5B1FEB0C1D}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{BC329A76-F079-4CFE-A5C9-EB5B1FEB0C1D}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{BC329A76-F079-4CFE-A5C9-EB5B1FEB0C1D}.Debug|x64.Build.0 = Debug|Any CPU
+		{BC329A76-F079-4CFE-A5C9-EB5B1FEB0C1D}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{BC329A76-F079-4CFE-A5C9-EB5B1FEB0C1D}.Debug|x86.Build.0 = Debug|Any CPU
+		{BC329A76-F079-4CFE-A5C9-EB5B1FEB0C1D}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{BC329A76-F079-4CFE-A5C9-EB5B1FEB0C1D}.Release|Any CPU.Build.0 = Release|Any CPU
+		{BC329A76-F079-4CFE-A5C9-EB5B1FEB0C1D}.Release|x64.ActiveCfg = Release|Any CPU
+		{BC329A76-F079-4CFE-A5C9-EB5B1FEB0C1D}.Release|x64.Build.0 = Release|Any CPU
+		{BC329A76-F079-4CFE-A5C9-EB5B1FEB0C1D}.Release|x86.ActiveCfg = Release|Any CPU
+		{BC329A76-F079-4CFE-A5C9-EB5B1FEB0C1D}.Release|x86.Build.0 = Release|Any CPU
+		{26B9C63A-3900-4D49-A7D7-3124CC1B02B3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{26B9C63A-3900-4D49-A7D7-3124CC1B02B3}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{26B9C63A-3900-4D49-A7D7-3124CC1B02B3}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{26B9C63A-3900-4D49-A7D7-3124CC1B02B3}.Debug|x64.Build.0 = Debug|Any CPU
+		{26B9C63A-3900-4D49-A7D7-3124CC1B02B3}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{26B9C63A-3900-4D49-A7D7-3124CC1B02B3}.Debug|x86.Build.0 = Debug|Any CPU
+		{26B9C63A-3900-4D49-A7D7-3124CC1B02B3}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{26B9C63A-3900-4D49-A7D7-3124CC1B02B3}.Release|Any CPU.Build.0 = Release|Any CPU
+		{26B9C63A-3900-4D49-A7D7-3124CC1B02B3}.Release|x64.ActiveCfg = Release|Any CPU
+		{26B9C63A-3900-4D49-A7D7-3124CC1B02B3}.Release|x64.Build.0 = Release|Any CPU
+		{26B9C63A-3900-4D49-A7D7-3124CC1B02B3}.Release|x86.ActiveCfg = Release|Any CPU
+		{26B9C63A-3900-4D49-A7D7-3124CC1B02B3}.Release|x86.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(NestedProjects) = preSolution
-		{C3510461-A00E-4D02-9B43-CC219FA803CB} = {9B70EE8D-3AFA-4978-B672-7E5D013A6446}
-		{568F72EF-24D4-4DE8-A4AC-2936CEDC8239} = {9B70EE8D-3AFA-4978-B672-7E5D013A6446}
-		{6BAC9990-5BFE-49A2-B6F6-BEDF477549B1} = {E7AF7A6B-F7C4-4D1A-9166-E3FA2EC7A5BB}
+		{FB00451C-8073-4FD8-8AD8-DCACADAD974D} = {4A009A29-97B8-43C1-AD8E-6CCDF20D62DF}
+		{BC329A76-F079-4CFE-A5C9-EB5B1FEB0C1D} = {4A009A29-97B8-43C1-AD8E-6CCDF20D62DF}
+		{26B9C63A-3900-4D49-A7D7-3124CC1B02B3} = {80B379AD-773A-4072-93DF-B7F81B596BBE}
 	EndGlobalSection
 EndGlobal