From 03de090ab9b8826323ef6d080bb3a5cf50b58cbe Mon Sep 17 00:00:00 2001 From: Tomasz Kajetan Stanczak Date: Tue, 5 Feb 2019 12:40:39 +0000 Subject: [PATCH] netocre upgrade to 2.2.1 --- .travis.yml | 3 +- Dockerfile | 4 +-- Dockerfile_full | 4 +-- q | 30 ------------------- src/Dirichlet | 2 +- .../Ethereum.Basic.Test.csproj | 2 +- .../Ethereum.Blockchain.Block.Test.csproj | 2 +- .../Ethereum.Blockchain.Test.csproj | 2 +- .../Ethereum.Difficulty.Test.csproj | 2 +- .../Ethereum.HexPrefix.Test.csproj | 2 +- .../Ethereum.KeyAddress.Test.csproj | 2 +- .../Ethereum.PoW.Test.csproj | 2 +- .../Ethereum.Rlp.Test.csproj | 2 +- .../Ethereum.Test.Base.csproj | 2 +- .../Ethereum.Transaction.Test.csproj | 2 +- .../Ethereum.Transition.Test.csproj | 2 +- .../Ethereum.Trie.Test.csproj | 2 +- .../Ethereum.VM.Test/Ethereum.VM.Test.csproj | 2 +- .../Hive/nethermind_local/Dockerfile | 2 +- .../Hive/nethermind_master/Dockerfile | 4 +-- .../Nethermind.Abi.Test.csproj | 2 +- .../Nethermind.Abi/Nethermind.Abi.csproj | 4 +-- .../Nethermind.Benchmarks.csproj | 2 +- .../Nethermind.Blockchain.Test.Runner.csproj | 2 +- .../Nethermind.Blockchain.Test.csproj | 2 +- .../Nethermind.Blockchain.csproj | 2 +- .../Nethermind.Cli/Nethermind.Cli.csproj | 5 ++-- .../Nethermind.Clique.Test.csproj | 2 +- .../Nethermind.Clique.csproj | 2 +- .../Nethermind.Config.Test.csproj | 2 +- .../Nethermind.Config.csproj | 2 +- .../Nethermind.Core.Test.csproj | 2 +- .../Nethermind.Core/Nethermind.Core.csproj | 2 +- .../Nethermind.Db.Test.csproj | 2 +- .../Nethermind.Db/Nethermind.Db.csproj | 2 +- .../Nethermind.DiagTools.csproj | 2 +- .../Nethermind.Evm.Test.csproj | 2 +- .../Nethermind.Evm/Nethermind.Evm.csproj | 2 +- .../Nethermind.EvmPlayground.csproj | 2 +- .../Nethermind.Facade.csproj | 2 +- .../Nethermind.HashLib.csproj | 2 +- .../Nethermind.JsonRpc.Client.csproj | 2 +- .../Nethermind.JsonRpc.Test.csproj | 2 +- .../Nethermind.JsonRpc.csproj | 2 +- .../Nethermind.KeyStore.Test.csproj | 2 +- .../Nethermind.KeyStore.csproj | 2 +- .../Nethermind.Mining.Test.csproj | 2 +- .../Nethermind.Mining.csproj | 2 +- .../Nethermind.MrWolf.csproj | 4 +-- .../Nethermind.Network.Test.csproj | 2 +- .../Nethermind.Network.csproj | 2 +- .../Nethermind.Overseer.Test.csproj | 2 +- .../Nethermind.PerfTest.csproj | 2 +- .../Nethermind.Runner.Test.csproj | 2 +- .../Nethermind.Runner.TestClient.csproj | 2 +- .../PublishProfiles/FolderProfile.pubxml | 2 +- src/Nethermind/Nethermind.Runner/Dockerfile | 2 +- .../Nethermind.Runner.csproj | 6 ++-- .../PublishProfiles/FolderProfile.pubxml | 2 +- .../Runners/EthereumRunner.cs | 18 ++++++----- .../Nethermind.Secp256k1.Test.csproj | 2 +- .../Nethermind.Secp256k1.csproj | 2 +- .../Nethermind.Stats/Nethermind.Stats.csproj | 4 +-- .../Nethermind.Store.Rpc.csproj | 2 +- .../Nethermind.Store.Test.csproj | 2 +- .../Nethermind.Store/Nethermind.Store.csproj | 2 +- .../Nethermind.Wallet.Test.csproj | 2 +- .../Nethermind.Wallet.csproj | 2 +- src/rocksdb-sharp | 2 +- 69 files changed, 89 insertions(+), 113 deletions(-) delete mode 100644 q diff --git a/.travis.yml b/.travis.yml index ee821ebe6e3..ecb4658ef38 100755 --- a/.travis.yml +++ b/.travis.yml @@ -1,7 +1,8 @@ language: csharp mono: none -dotnet: 2.1.402 sudo: required +dist: xenial +dotnet: 2.2 git: depth: 3 before_script: diff --git a/Dockerfile b/Dockerfile index 8bb6a56aff6..74083edaf18 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,9 +1,9 @@ -FROM microsoft/dotnet:2.1-sdk AS build +FROM microsoft/dotnet:2.2-sdk AS build COPY . . RUN git submodule update --init RUN cd src/Nethermind/Nethermind.Runner && dotnet publish -c release -o out -FROM microsoft/dotnet:2.1-aspnetcore-runtime +FROM microsoft/dotnet:2.2-aspnetcore-runtime RUN apt-get update && apt-get -y install libsnappy-dev libc6-dev libc6 unzip WORKDIR /nethermind COPY --from=build /src/Nethermind/Nethermind.Runner/out . diff --git a/Dockerfile_full b/Dockerfile_full index 07f6225519a..e8781285fb4 100644 --- a/Dockerfile_full +++ b/Dockerfile_full @@ -4,12 +4,12 @@ RUN apt-get update -y && apt-get install -y git && \ git clone https://github.com/NethermindEth/nethermind && \ cd nethermind && git submodule update --init -FROM microsoft/dotnet:2.1-sdk AS build +FROM microsoft/dotnet:2.2-sdk AS build COPY --from=clone /src . RUN cd nethermind/src/Nethermind/Nethermind.Runner && \ dotnet publish -c release -o out -FROM microsoft/dotnet:2.1-aspnetcore-runtime +FROM microsoft/dotnet:2.2-aspnetcore-runtime RUN apt-get update -y && apt-get install -y libsnappy-dev libc6-dev libc6 unzip COPY --from=build /nethermind/src/Nethermind/Nethermind.Runner/out . diff --git a/q b/q deleted file mode 100644 index 71176b1e08e..00000000000 --- a/q +++ /dev/null @@ -1,30 +0,0 @@ -diff --git a/src/Nethermind/Nethermind.sln b/src/Nethermind/Nethermind.sln -index 7ed20894..cb5355b4 100644 ---- a/src/Nethermind/Nethermind.sln -+++ b/src/Nethermind/Nethermind.sln -@@ -153,6 +153,10 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Nethermind.Abi.Test", "Neth - EndProject - Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Nethermind.MrWolf", "Nethermind.MrWolf\Nethermind.MrWolf.csproj", "{43545FB4-82E6-4763-830B-D6B6E4662927}" - EndProject -+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Nethermind.Cli", "Nethermind.Cli\Nethermind.Cli.csproj", "{AABF177A-9E50-4736-AE65-0152B0C26121}" -+EndProject -+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Nethermind.Facade", "Nethermind.Facade\Nethermind.Facade.csproj", "{B71A6E5F-73A4-4A45-A324-A10496F80DAA}" -+EndProject - Global - GlobalSection(SolutionConfigurationPlatforms) = preSolution - Debug|Any CPU = Debug|Any CPU -@@ -395,6 +399,14 @@ Global - {43545FB4-82E6-4763-830B-D6B6E4662927}.Debug|Any CPU.Build.0 = Debug|Any CPU - {43545FB4-82E6-4763-830B-D6B6E4662927}.Release|Any CPU.ActiveCfg = Release|Any CPU - {43545FB4-82E6-4763-830B-D6B6E4662927}.Release|Any CPU.Build.0 = Release|Any CPU -+ {AABF177A-9E50-4736-AE65-0152B0C26121}.Debug|Any CPU.ActiveCfg = Debug|Any CPU -+ {AABF177A-9E50-4736-AE65-0152B0C26121}.Debug|Any CPU.Build.0 = Debug|Any CPU -+ {AABF177A-9E50-4736-AE65-0152B0C26121}.Release|Any CPU.ActiveCfg = Release|Any CPU -+ {AABF177A-9E50-4736-AE65-0152B0C26121}.Release|Any CPU.Build.0 = Release|Any CPU -+ {B71A6E5F-73A4-4A45-A324-A10496F80DAA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU -+ {B71A6E5F-73A4-4A45-A324-A10496F80DAA}.Debug|Any CPU.Build.0 = Debug|Any CPU -+ {B71A6E5F-73A4-4A45-A324-A10496F80DAA}.Release|Any CPU.ActiveCfg = Release|Any CPU -+ {B71A6E5F-73A4-4A45-A324-A10496F80DAA}.Release|Any CPU.Build.0 = Release|Any CPU - EndGlobalSection - GlobalSection(SolutionProperties) = preSolution - HideSolutionNode = FALSE diff --git a/src/Dirichlet b/src/Dirichlet index fc28924d9a5..c6180c4c9e8 160000 --- a/src/Dirichlet +++ b/src/Dirichlet @@ -1 +1 @@ -Subproject commit fc28924d9a5b97d435bdbf605121b4ae9036f38b +Subproject commit c6180c4c9e820c9cc4e10242d745ce7f7882eec6 diff --git a/src/Nethermind/Ethereum.Basic.Test/Ethereum.Basic.Test.csproj b/src/Nethermind/Ethereum.Basic.Test/Ethereum.Basic.Test.csproj index 6bf7d444c26..c635f74f550 100644 --- a/src/Nethermind/Ethereum.Basic.Test/Ethereum.Basic.Test.csproj +++ b/src/Nethermind/Ethereum.Basic.Test/Ethereum.Basic.Test.csproj @@ -1,6 +1,6 @@  - netcoreapp2.1 + netcoreapp2.2 false 7.2 diff --git a/src/Nethermind/Ethereum.Blockchain.Block.Test/Ethereum.Blockchain.Block.Test.csproj b/src/Nethermind/Ethereum.Blockchain.Block.Test/Ethereum.Blockchain.Block.Test.csproj index fdb47d0c9aa..5e7a3b16437 100644 --- a/src/Nethermind/Ethereum.Blockchain.Block.Test/Ethereum.Blockchain.Block.Test.csproj +++ b/src/Nethermind/Ethereum.Blockchain.Block.Test/Ethereum.Blockchain.Block.Test.csproj @@ -1,6 +1,6 @@  - netcoreapp2.1 + netcoreapp2.2 false 7.2 diff --git a/src/Nethermind/Ethereum.Blockchain.Test/Ethereum.Blockchain.Test.csproj b/src/Nethermind/Ethereum.Blockchain.Test/Ethereum.Blockchain.Test.csproj index daf6630f67b..8baf608e002 100644 --- a/src/Nethermind/Ethereum.Blockchain.Test/Ethereum.Blockchain.Test.csproj +++ b/src/Nethermind/Ethereum.Blockchain.Test/Ethereum.Blockchain.Test.csproj @@ -1,6 +1,6 @@  - netcoreapp2.1 + netcoreapp2.2 false 7.2 diff --git a/src/Nethermind/Ethereum.Difficulty.Test/Ethereum.Difficulty.Test.csproj b/src/Nethermind/Ethereum.Difficulty.Test/Ethereum.Difficulty.Test.csproj index f027eaa0a06..9464057192a 100644 --- a/src/Nethermind/Ethereum.Difficulty.Test/Ethereum.Difficulty.Test.csproj +++ b/src/Nethermind/Ethereum.Difficulty.Test/Ethereum.Difficulty.Test.csproj @@ -1,6 +1,6 @@  - netcoreapp2.1 + netcoreapp2.2 false 7.2 diff --git a/src/Nethermind/Ethereum.HexPrefix.Test/Ethereum.HexPrefix.Test.csproj b/src/Nethermind/Ethereum.HexPrefix.Test/Ethereum.HexPrefix.Test.csproj index fb19d79c694..02a2b288a82 100644 --- a/src/Nethermind/Ethereum.HexPrefix.Test/Ethereum.HexPrefix.Test.csproj +++ b/src/Nethermind/Ethereum.HexPrefix.Test/Ethereum.HexPrefix.Test.csproj @@ -1,6 +1,6 @@  - netcoreapp2.1 + netcoreapp2.2 false 7.2 diff --git a/src/Nethermind/Ethereum.KeyAddress.Test/Ethereum.KeyAddress.Test.csproj b/src/Nethermind/Ethereum.KeyAddress.Test/Ethereum.KeyAddress.Test.csproj index 83d510f5292..ce878eecc2e 100644 --- a/src/Nethermind/Ethereum.KeyAddress.Test/Ethereum.KeyAddress.Test.csproj +++ b/src/Nethermind/Ethereum.KeyAddress.Test/Ethereum.KeyAddress.Test.csproj @@ -1,6 +1,6 @@  - netcoreapp2.1 + netcoreapp2.2 false 7.2 diff --git a/src/Nethermind/Ethereum.PoW.Test/Ethereum.PoW.Test.csproj b/src/Nethermind/Ethereum.PoW.Test/Ethereum.PoW.Test.csproj index 6dc862c883b..2b924f1010a 100644 --- a/src/Nethermind/Ethereum.PoW.Test/Ethereum.PoW.Test.csproj +++ b/src/Nethermind/Ethereum.PoW.Test/Ethereum.PoW.Test.csproj @@ -1,6 +1,6 @@  - netcoreapp2.1 + netcoreapp2.2 false 7.2 diff --git a/src/Nethermind/Ethereum.Rlp.Test/Ethereum.Rlp.Test.csproj b/src/Nethermind/Ethereum.Rlp.Test/Ethereum.Rlp.Test.csproj index 9406f245c60..6fcbce1b7a4 100644 --- a/src/Nethermind/Ethereum.Rlp.Test/Ethereum.Rlp.Test.csproj +++ b/src/Nethermind/Ethereum.Rlp.Test/Ethereum.Rlp.Test.csproj @@ -1,6 +1,6 @@  - netcoreapp2.1 + netcoreapp2.2 false 7.2 diff --git a/src/Nethermind/Ethereum.Test.Base/Ethereum.Test.Base.csproj b/src/Nethermind/Ethereum.Test.Base/Ethereum.Test.Base.csproj index 7e6d1871448..3d2f90b7a43 100644 --- a/src/Nethermind/Ethereum.Test.Base/Ethereum.Test.Base.csproj +++ b/src/Nethermind/Ethereum.Test.Base/Ethereum.Test.Base.csproj @@ -1,6 +1,6 @@  - netcoreapp2.1 + netcoreapp2.2 false 7.2 diff --git a/src/Nethermind/Ethereum.Transaction.Test/Ethereum.Transaction.Test.csproj b/src/Nethermind/Ethereum.Transaction.Test/Ethereum.Transaction.Test.csproj index 2d5345049ac..34b3a50a871 100644 --- a/src/Nethermind/Ethereum.Transaction.Test/Ethereum.Transaction.Test.csproj +++ b/src/Nethermind/Ethereum.Transaction.Test/Ethereum.Transaction.Test.csproj @@ -1,6 +1,6 @@  - netcoreapp2.1 + netcoreapp2.2 false 7.2 diff --git a/src/Nethermind/Ethereum.Transition.Test/Ethereum.Transition.Test.csproj b/src/Nethermind/Ethereum.Transition.Test/Ethereum.Transition.Test.csproj index 35802ea61d0..dedeab5f8d2 100644 --- a/src/Nethermind/Ethereum.Transition.Test/Ethereum.Transition.Test.csproj +++ b/src/Nethermind/Ethereum.Transition.Test/Ethereum.Transition.Test.csproj @@ -1,6 +1,6 @@  - netcoreapp2.1 + netcoreapp2.2 false 7.2 diff --git a/src/Nethermind/Ethereum.Trie.Test/Ethereum.Trie.Test.csproj b/src/Nethermind/Ethereum.Trie.Test/Ethereum.Trie.Test.csproj index 1fada37fdff..adb7d18d4f6 100644 --- a/src/Nethermind/Ethereum.Trie.Test/Ethereum.Trie.Test.csproj +++ b/src/Nethermind/Ethereum.Trie.Test/Ethereum.Trie.Test.csproj @@ -1,6 +1,6 @@  - netcoreapp2.1 + netcoreapp2.2 false 7.2 diff --git a/src/Nethermind/Ethereum.VM.Test/Ethereum.VM.Test.csproj b/src/Nethermind/Ethereum.VM.Test/Ethereum.VM.Test.csproj index 6706feee293..340fed41dce 100644 --- a/src/Nethermind/Ethereum.VM.Test/Ethereum.VM.Test.csproj +++ b/src/Nethermind/Ethereum.VM.Test/Ethereum.VM.Test.csproj @@ -1,6 +1,6 @@  - netcoreapp2.1 + netcoreapp2.2 false 7.2 diff --git a/src/Nethermind/Hive/nethermind_local/Dockerfile b/src/Nethermind/Hive/nethermind_local/Dockerfile index 834a74d627b..afe60a99d13 100644 --- a/src/Nethermind/Hive/nethermind_local/Dockerfile +++ b/src/Nethermind/Hive/nethermind_local/Dockerfile @@ -1,5 +1,5 @@ # Docker container spec for Nethermind Ethereum Client -FROM microsoft/dotnet:2.1-aspnetcore-runtime +FROM microsoft/dotnet:2.2-aspnetcore-runtime RUN apt update -y && apt install -y libsnappy-dev libc6-dev libc6 unzip jq COPY Nethermind/ . diff --git a/src/Nethermind/Hive/nethermind_master/Dockerfile b/src/Nethermind/Hive/nethermind_master/Dockerfile index 5a4ab5fd7d3..b39e0680e12 100755 --- a/src/Nethermind/Hive/nethermind_master/Dockerfile +++ b/src/Nethermind/Hive/nethermind_master/Dockerfile @@ -9,13 +9,13 @@ RUN apt update -y && apt install -y git jq && \ | jq ".+ {\"commit\":\"$(git rev-parse HEAD)\"}" \ > /version.json) -FROM microsoft/dotnet:2.1-sdk AS build +FROM microsoft/dotnet:2.2-sdk AS build COPY --from=clone /src . COPY --from=clone /version.json . RUN cd nethermind/src/Nethermind/Nethermind.Runner && \ dotnet publish -c release -o out -FROM microsoft/dotnet:2.1-aspnetcore-runtime +FROM microsoft/dotnet:2.2-aspnetcore-runtime RUN apt update -y && apt install -y libsnappy-dev libc6-dev libc6 unzip jq COPY --from=build /nethermind/src/Nethermind/Nethermind.Runner/out . diff --git a/src/Nethermind/Nethermind.Abi.Test/Nethermind.Abi.Test.csproj b/src/Nethermind/Nethermind.Abi.Test/Nethermind.Abi.Test.csproj index 4dd274357e3..96365fdb87e 100644 --- a/src/Nethermind/Nethermind.Abi.Test/Nethermind.Abi.Test.csproj +++ b/src/Nethermind/Nethermind.Abi.Test/Nethermind.Abi.Test.csproj @@ -1,7 +1,7 @@  - netcoreapp2.1 + netcoreapp2.2 false diff --git a/src/Nethermind/Nethermind.Abi/Nethermind.Abi.csproj b/src/Nethermind/Nethermind.Abi/Nethermind.Abi.csproj index 0aaf0f7008c..60b0b97a5f7 100644 --- a/src/Nethermind/Nethermind.Abi/Nethermind.Abi.csproj +++ b/src/Nethermind/Nethermind.Abi/Nethermind.Abi.csproj @@ -1,7 +1,7 @@ - + - netcoreapp2.1 + netcoreapp2.2 7.3 diff --git a/src/Nethermind/Nethermind.Benchmarks/Nethermind.Benchmarks.csproj b/src/Nethermind/Nethermind.Benchmarks/Nethermind.Benchmarks.csproj index 571533b594f..a9cc269d718 100644 --- a/src/Nethermind/Nethermind.Benchmarks/Nethermind.Benchmarks.csproj +++ b/src/Nethermind/Nethermind.Benchmarks/Nethermind.Benchmarks.csproj @@ -1,7 +1,7 @@  Exe - netcoreapp2.1 + netcoreapp2.2 7.2 diff --git a/src/Nethermind/Nethermind.Blockchain.Test.Runner/Nethermind.Blockchain.Test.Runner.csproj b/src/Nethermind/Nethermind.Blockchain.Test.Runner/Nethermind.Blockchain.Test.Runner.csproj index 6776d74c914..c472a5e0575 100644 --- a/src/Nethermind/Nethermind.Blockchain.Test.Runner/Nethermind.Blockchain.Test.Runner.csproj +++ b/src/Nethermind/Nethermind.Blockchain.Test.Runner/Nethermind.Blockchain.Test.Runner.csproj @@ -1,7 +1,7 @@  Exe - netcoreapp2.1 + netcoreapp2.2 7.2 diff --git a/src/Nethermind/Nethermind.Blockchain.Test/Nethermind.Blockchain.Test.csproj b/src/Nethermind/Nethermind.Blockchain.Test/Nethermind.Blockchain.Test.csproj index e1d268214ec..caf631a6e2f 100644 --- a/src/Nethermind/Nethermind.Blockchain.Test/Nethermind.Blockchain.Test.csproj +++ b/src/Nethermind/Nethermind.Blockchain.Test/Nethermind.Blockchain.Test.csproj @@ -1,6 +1,6 @@  - netcoreapp2.1 + netcoreapp2.2 false diff --git a/src/Nethermind/Nethermind.Blockchain/Nethermind.Blockchain.csproj b/src/Nethermind/Nethermind.Blockchain/Nethermind.Blockchain.csproj index c3f4898114e..bec7c58426c 100644 --- a/src/Nethermind/Nethermind.Blockchain/Nethermind.Blockchain.csproj +++ b/src/Nethermind/Nethermind.Blockchain/Nethermind.Blockchain.csproj @@ -1,6 +1,6 @@  - netcoreapp2.1 + netcoreapp2.2 true Nethermind.Core.Test 7.2 diff --git a/src/Nethermind/Nethermind.Cli/Nethermind.Cli.csproj b/src/Nethermind/Nethermind.Cli/Nethermind.Cli.csproj index dc88b50b3f5..fd161bd82d0 100644 --- a/src/Nethermind/Nethermind.Cli/Nethermind.Cli.csproj +++ b/src/Nethermind/Nethermind.Cli/Nethermind.Cli.csproj @@ -2,9 +2,10 @@ Exe - netcoreapp2.1 + netcoreapp2.2 + true - + diff --git a/src/Nethermind/Nethermind.Clique.Test/Nethermind.Clique.Test.csproj b/src/Nethermind/Nethermind.Clique.Test/Nethermind.Clique.Test.csproj index 793f33b8ab6..ece902ed2a0 100644 --- a/src/Nethermind/Nethermind.Clique.Test/Nethermind.Clique.Test.csproj +++ b/src/Nethermind/Nethermind.Clique.Test/Nethermind.Clique.Test.csproj @@ -1,7 +1,7 @@  - netcoreapp2.1 + netcoreapp2.2 false diff --git a/src/Nethermind/Nethermind.Clique/Nethermind.Clique.csproj b/src/Nethermind/Nethermind.Clique/Nethermind.Clique.csproj index 42c0a039bcd..6fceccdb9ef 100644 --- a/src/Nethermind/Nethermind.Clique/Nethermind.Clique.csproj +++ b/src/Nethermind/Nethermind.Clique/Nethermind.Clique.csproj @@ -1,7 +1,7 @@  - netcoreapp2.1 + netcoreapp2.2 diff --git a/src/Nethermind/Nethermind.Config.Test/Nethermind.Config.Test.csproj b/src/Nethermind/Nethermind.Config.Test/Nethermind.Config.Test.csproj index b6245571721..b8fad77e877 100644 --- a/src/Nethermind/Nethermind.Config.Test/Nethermind.Config.Test.csproj +++ b/src/Nethermind/Nethermind.Config.Test/Nethermind.Config.Test.csproj @@ -1,6 +1,6 @@  - netcoreapp2.1 + netcoreapp2.2 false diff --git a/src/Nethermind/Nethermind.Config/Nethermind.Config.csproj b/src/Nethermind/Nethermind.Config/Nethermind.Config.csproj index 562ddbb27a8..8b64ca2ffdb 100644 --- a/src/Nethermind/Nethermind.Config/Nethermind.Config.csproj +++ b/src/Nethermind/Nethermind.Config/Nethermind.Config.csproj @@ -1,6 +1,6 @@  - netcoreapp2.1 + netcoreapp2.2 diff --git a/src/Nethermind/Nethermind.Core.Test/Nethermind.Core.Test.csproj b/src/Nethermind/Nethermind.Core.Test/Nethermind.Core.Test.csproj index 9af9b87a426..6eb2ba5120e 100644 --- a/src/Nethermind/Nethermind.Core.Test/Nethermind.Core.Test.csproj +++ b/src/Nethermind/Nethermind.Core.Test/Nethermind.Core.Test.csproj @@ -1,6 +1,6 @@  - netcoreapp2.1 + netcoreapp2.2 false diff --git a/src/Nethermind/Nethermind.Core/Nethermind.Core.csproj b/src/Nethermind/Nethermind.Core/Nethermind.Core.csproj index 2ae5b0053db..ae70240ca61 100644 --- a/src/Nethermind/Nethermind.Core/Nethermind.Core.csproj +++ b/src/Nethermind/Nethermind.Core/Nethermind.Core.csproj @@ -1,6 +1,6 @@  - netcoreapp2.1 + netcoreapp2.2 true 7.2 diff --git a/src/Nethermind/Nethermind.Db.Test/Nethermind.Db.Test.csproj b/src/Nethermind/Nethermind.Db.Test/Nethermind.Db.Test.csproj index 0fc69d89fe1..db83809caa6 100644 --- a/src/Nethermind/Nethermind.Db.Test/Nethermind.Db.Test.csproj +++ b/src/Nethermind/Nethermind.Db.Test/Nethermind.Db.Test.csproj @@ -1,6 +1,6 @@  - netcoreapp2.1 + netcoreapp2.2 false 7.2 diff --git a/src/Nethermind/Nethermind.Db/Nethermind.Db.csproj b/src/Nethermind/Nethermind.Db/Nethermind.Db.csproj index 046818948dc..1d663d388c7 100644 --- a/src/Nethermind/Nethermind.Db/Nethermind.Db.csproj +++ b/src/Nethermind/Nethermind.Db/Nethermind.Db.csproj @@ -1,6 +1,6 @@  - netcoreapp2.1 + netcoreapp2.2 7.2 diff --git a/src/Nethermind/Nethermind.DiagTools/Nethermind.DiagTools.csproj b/src/Nethermind/Nethermind.DiagTools/Nethermind.DiagTools.csproj index 256da1cce44..5e770ac0824 100644 --- a/src/Nethermind/Nethermind.DiagTools/Nethermind.DiagTools.csproj +++ b/src/Nethermind/Nethermind.DiagTools/Nethermind.DiagTools.csproj @@ -1,7 +1,7 @@  Exe - netcoreapp2.1 + netcoreapp2.2 7.2 diff --git a/src/Nethermind/Nethermind.Evm.Test/Nethermind.Evm.Test.csproj b/src/Nethermind/Nethermind.Evm.Test/Nethermind.Evm.Test.csproj index ffb1edfbaf2..b7888d2aa12 100644 --- a/src/Nethermind/Nethermind.Evm.Test/Nethermind.Evm.Test.csproj +++ b/src/Nethermind/Nethermind.Evm.Test/Nethermind.Evm.Test.csproj @@ -1,6 +1,6 @@  - netcoreapp2.1 + netcoreapp2.2 false diff --git a/src/Nethermind/Nethermind.Evm/Nethermind.Evm.csproj b/src/Nethermind/Nethermind.Evm/Nethermind.Evm.csproj index 9765f98a4db..7048bab7558 100644 --- a/src/Nethermind/Nethermind.Evm/Nethermind.Evm.csproj +++ b/src/Nethermind/Nethermind.Evm/Nethermind.Evm.csproj @@ -1,6 +1,6 @@  - netcoreapp2.1 + netcoreapp2.2 7.2 diff --git a/src/Nethermind/Nethermind.EvmPlayground/Nethermind.EvmPlayground.csproj b/src/Nethermind/Nethermind.EvmPlayground/Nethermind.EvmPlayground.csproj index 489a4b6b072..44643fc9893 100644 --- a/src/Nethermind/Nethermind.EvmPlayground/Nethermind.EvmPlayground.csproj +++ b/src/Nethermind/Nethermind.EvmPlayground/Nethermind.EvmPlayground.csproj @@ -1,7 +1,7 @@  - netcoreapp2.1 + netcoreapp2.2 Exe 7.3 diff --git a/src/Nethermind/Nethermind.Facade/Nethermind.Facade.csproj b/src/Nethermind/Nethermind.Facade/Nethermind.Facade.csproj index dfae230dd19..5e0c2d515b7 100644 --- a/src/Nethermind/Nethermind.Facade/Nethermind.Facade.csproj +++ b/src/Nethermind/Nethermind.Facade/Nethermind.Facade.csproj @@ -1,7 +1,7 @@  - netcoreapp2.1 + netcoreapp2.2 diff --git a/src/Nethermind/Nethermind.HashLib/Nethermind.HashLib.csproj b/src/Nethermind/Nethermind.HashLib/Nethermind.HashLib.csproj index 262aa0ef0d2..d41c19c46ed 100644 --- a/src/Nethermind/Nethermind.HashLib/Nethermind.HashLib.csproj +++ b/src/Nethermind/Nethermind.HashLib/Nethermind.HashLib.csproj @@ -1,6 +1,6 @@  - netcoreapp2.1 + netcoreapp2.2 7.2 diff --git a/src/Nethermind/Nethermind.JsonRpc.Client/Nethermind.JsonRpc.Client.csproj b/src/Nethermind/Nethermind.JsonRpc.Client/Nethermind.JsonRpc.Client.csproj index 10acda56bd4..87dc2451acf 100644 --- a/src/Nethermind/Nethermind.JsonRpc.Client/Nethermind.JsonRpc.Client.csproj +++ b/src/Nethermind/Nethermind.JsonRpc.Client/Nethermind.JsonRpc.Client.csproj @@ -1,6 +1,6 @@  - netcoreapp2.1 + netcoreapp2.2 diff --git a/src/Nethermind/Nethermind.JsonRpc.Test/Nethermind.JsonRpc.Test.csproj b/src/Nethermind/Nethermind.JsonRpc.Test/Nethermind.JsonRpc.Test.csproj index 454427f5f85..c2147efdb3f 100644 --- a/src/Nethermind/Nethermind.JsonRpc.Test/Nethermind.JsonRpc.Test.csproj +++ b/src/Nethermind/Nethermind.JsonRpc.Test/Nethermind.JsonRpc.Test.csproj @@ -1,6 +1,6 @@  - netcoreapp2.1 + netcoreapp2.2 false diff --git a/src/Nethermind/Nethermind.JsonRpc/Nethermind.JsonRpc.csproj b/src/Nethermind/Nethermind.JsonRpc/Nethermind.JsonRpc.csproj index 5b3fe4ceff9..33c7a18b19e 100644 --- a/src/Nethermind/Nethermind.JsonRpc/Nethermind.JsonRpc.csproj +++ b/src/Nethermind/Nethermind.JsonRpc/Nethermind.JsonRpc.csproj @@ -1,6 +1,6 @@  - netcoreapp2.1 + netcoreapp2.2 diff --git a/src/Nethermind/Nethermind.KeyStore.Test/Nethermind.KeyStore.Test.csproj b/src/Nethermind/Nethermind.KeyStore.Test/Nethermind.KeyStore.Test.csproj index 133e41daefe..57de0cf03b8 100644 --- a/src/Nethermind/Nethermind.KeyStore.Test/Nethermind.KeyStore.Test.csproj +++ b/src/Nethermind/Nethermind.KeyStore.Test/Nethermind.KeyStore.Test.csproj @@ -1,6 +1,6 @@  - netcoreapp2.1 + netcoreapp2.2 false diff --git a/src/Nethermind/Nethermind.KeyStore/Nethermind.KeyStore.csproj b/src/Nethermind/Nethermind.KeyStore/Nethermind.KeyStore.csproj index 286bc554b27..e78add6bdb8 100644 --- a/src/Nethermind/Nethermind.KeyStore/Nethermind.KeyStore.csproj +++ b/src/Nethermind/Nethermind.KeyStore/Nethermind.KeyStore.csproj @@ -1,6 +1,6 @@  - netcoreapp2.1 + netcoreapp2.2 NU1701;NU1702 diff --git a/src/Nethermind/Nethermind.Mining.Test/Nethermind.Mining.Test.csproj b/src/Nethermind/Nethermind.Mining.Test/Nethermind.Mining.Test.csproj index 83d5b5824b7..b9643aab5d0 100644 --- a/src/Nethermind/Nethermind.Mining.Test/Nethermind.Mining.Test.csproj +++ b/src/Nethermind/Nethermind.Mining.Test/Nethermind.Mining.Test.csproj @@ -1,6 +1,6 @@  - netcoreapp2.1 + netcoreapp2.2 false 7.2 diff --git a/src/Nethermind/Nethermind.Mining/Nethermind.Mining.csproj b/src/Nethermind/Nethermind.Mining/Nethermind.Mining.csproj index d31cf0e3788..ade656249e8 100644 --- a/src/Nethermind/Nethermind.Mining/Nethermind.Mining.csproj +++ b/src/Nethermind/Nethermind.Mining/Nethermind.Mining.csproj @@ -1,6 +1,6 @@  - netcoreapp2.1 + netcoreapp2.2 false 7.2 Library diff --git a/src/Nethermind/Nethermind.MrWolf/Nethermind.MrWolf.csproj b/src/Nethermind/Nethermind.MrWolf/Nethermind.MrWolf.csproj index fa830ff9596..972abcaa717 100644 --- a/src/Nethermind/Nethermind.MrWolf/Nethermind.MrWolf.csproj +++ b/src/Nethermind/Nethermind.MrWolf/Nethermind.MrWolf.csproj @@ -1,8 +1,8 @@ - + Exe - netcoreapp2.1 + netcoreapp2.2 diff --git a/src/Nethermind/Nethermind.Network.Test/Nethermind.Network.Test.csproj b/src/Nethermind/Nethermind.Network.Test/Nethermind.Network.Test.csproj index b58c8b093e4..f91b620d65b 100644 --- a/src/Nethermind/Nethermind.Network.Test/Nethermind.Network.Test.csproj +++ b/src/Nethermind/Nethermind.Network.Test/Nethermind.Network.Test.csproj @@ -1,6 +1,6 @@  - netcoreapp2.1 + netcoreapp2.2 false 7.2 diff --git a/src/Nethermind/Nethermind.Network/Nethermind.Network.csproj b/src/Nethermind/Nethermind.Network/Nethermind.Network.csproj index d510c2ece49..9ab6c485a86 100644 --- a/src/Nethermind/Nethermind.Network/Nethermind.Network.csproj +++ b/src/Nethermind/Nethermind.Network/Nethermind.Network.csproj @@ -1,6 +1,6 @@  - netcoreapp2.1 + netcoreapp2.2 7.2 diff --git a/src/Nethermind/Nethermind.Overseer.Test/Nethermind.Overseer.Test.csproj b/src/Nethermind/Nethermind.Overseer.Test/Nethermind.Overseer.Test.csproj index 3591d0c97d9..a73c9280d43 100644 --- a/src/Nethermind/Nethermind.Overseer.Test/Nethermind.Overseer.Test.csproj +++ b/src/Nethermind/Nethermind.Overseer.Test/Nethermind.Overseer.Test.csproj @@ -1,7 +1,7 @@  - netcoreapp2.1 + netcoreapp2.2 false diff --git a/src/Nethermind/Nethermind.PerfTest/Nethermind.PerfTest.csproj b/src/Nethermind/Nethermind.PerfTest/Nethermind.PerfTest.csproj index a774672cfb1..e407c1ea75c 100644 --- a/src/Nethermind/Nethermind.PerfTest/Nethermind.PerfTest.csproj +++ b/src/Nethermind/Nethermind.PerfTest/Nethermind.PerfTest.csproj @@ -1,7 +1,7 @@  Exe - netcoreapp2.1 + netcoreapp2.2 7.2 true true diff --git a/src/Nethermind/Nethermind.Runner.Test/Nethermind.Runner.Test.csproj b/src/Nethermind/Nethermind.Runner.Test/Nethermind.Runner.Test.csproj index 01e2e77a89f..b7efc69a1a4 100644 --- a/src/Nethermind/Nethermind.Runner.Test/Nethermind.Runner.Test.csproj +++ b/src/Nethermind/Nethermind.Runner.Test/Nethermind.Runner.Test.csproj @@ -1,6 +1,6 @@  - netcoreapp2.1 + netcoreapp2.2 false 7.2 diff --git a/src/Nethermind/Nethermind.Runner.TestClient/Nethermind.Runner.TestClient.csproj b/src/Nethermind/Nethermind.Runner.TestClient/Nethermind.Runner.TestClient.csproj index 256da1cce44..5e770ac0824 100644 --- a/src/Nethermind/Nethermind.Runner.TestClient/Nethermind.Runner.TestClient.csproj +++ b/src/Nethermind/Nethermind.Runner.TestClient/Nethermind.Runner.TestClient.csproj @@ -1,7 +1,7 @@  Exe - netcoreapp2.1 + netcoreapp2.2 7.2 diff --git a/src/Nethermind/Nethermind.Runner.TestClient/Properties/PublishProfiles/FolderProfile.pubxml b/src/Nethermind/Nethermind.Runner.TestClient/Properties/PublishProfiles/FolderProfile.pubxml index 548b9afb0cd..2b450f0ef09 100644 --- a/src/Nethermind/Nethermind.Runner.TestClient/Properties/PublishProfiles/FolderProfile.pubxml +++ b/src/Nethermind/Nethermind.Runner.TestClient/Properties/PublishProfiles/FolderProfile.pubxml @@ -7,7 +7,7 @@ by editing this MSBuild file. In order to learn more about this please visit htt FileSystem Release - netcoreapp2.0 + netcoreapp2.2 bin\Release\PublishOutput \ No newline at end of file diff --git a/src/Nethermind/Nethermind.Runner/Dockerfile b/src/Nethermind/Nethermind.Runner/Dockerfile index 5bee63b8f58..e21a101f16e 100644 --- a/src/Nethermind/Nethermind.Runner/Dockerfile +++ b/src/Nethermind/Nethermind.Runner/Dockerfile @@ -1,4 +1,4 @@ -FROM microsoft/dotnet:2.1-aspnetcore-runtime +FROM microsoft/dotnet:2.2-aspnetcore-runtime RUN apt-get update && apt-get -y install libsnappy-dev libc6-dev libc6 unzip diff --git a/src/Nethermind/Nethermind.Runner/Nethermind.Runner.csproj b/src/Nethermind/Nethermind.Runner/Nethermind.Runner.csproj index 5ab3f6c629e..3c0d785d3c0 100644 --- a/src/Nethermind/Nethermind.Runner/Nethermind.Runner.csproj +++ b/src/Nethermind/Nethermind.Runner/Nethermind.Runner.csproj @@ -1,21 +1,23 @@  Exe - netcoreapp2.1 + netcoreapp2.2 7.2 true true + true - + + {5751C57B-9F2D-45DE-BCC2-42645B85E39E} Nethermind.Core diff --git a/src/Nethermind/Nethermind.Runner/Properties/PublishProfiles/FolderProfile.pubxml b/src/Nethermind/Nethermind.Runner/Properties/PublishProfiles/FolderProfile.pubxml index 548b9afb0cd..2b450f0ef09 100644 --- a/src/Nethermind/Nethermind.Runner/Properties/PublishProfiles/FolderProfile.pubxml +++ b/src/Nethermind/Nethermind.Runner/Properties/PublishProfiles/FolderProfile.pubxml @@ -7,7 +7,7 @@ by editing this MSBuild file. In order to learn more about this please visit htt FileSystem Release - netcoreapp2.0 + netcoreapp2.2 bin\Release\PublishOutput \ No newline at end of file diff --git a/src/Nethermind/Nethermind.Runner/Runners/EthereumRunner.cs b/src/Nethermind/Nethermind.Runner/Runners/EthereumRunner.cs index 19d2636d9a4..43971461bda 100644 --- a/src/Nethermind/Nethermind.Runner/Runners/EthereumRunner.cs +++ b/src/Nethermind/Nethermind.Runner/Runners/EthereumRunner.cs @@ -209,6 +209,8 @@ private void RegisterJsonRpcModules() { return; } + + if(_logger.IsDebug) _logger.Debug($"Resolving CLI ({nameof(Cli.CliApiBuilder)})"); IReadOnlyDbProvider rpcDbProvider = new ReadOnlyDbProvider(_dbProvider, false); AlternativeChain rpcChain = new AlternativeChain(_blockTree, _blockValidator, _rewardCalculator, _specProvider, rpcDbProvider, _recoveryStep, _logManager, _transactionPool, _receiptStorage); @@ -737,13 +739,14 @@ await StartDiscovery().ContinueWith(initDiscoveryTask => } }); - await StartPeer().ContinueWith(initPeerManagerTask => + try { - if (initPeerManagerTask.IsFaulted) - { - _logger.Error("Unable to start peer manager.", initPeerManagerTask.Exception); - } - }); + StartPeer(); + } + catch (Exception e) + { + _logger.Error("Unable to start peer manager.", e); + }; if (_logger.IsInfo) _logger.Info($"Node is up and listening on {_enode.IpAddress}:{_enode.P2PPort}"); if (_logger.IsInfo) _logger.Info($"{ClientVersion.Description}"); @@ -866,12 +869,11 @@ private async Task InitPeer() _peerManager.Init(_initConfig.DiscoveryEnabled); } - private async Task StartPeer() + private void StartPeer() { if (!_initConfig.PeerManagerEnabled) { if (_logger.IsWarn) _logger.Warn($"Skipping peer manager init due to {nameof(_initConfig.PeerManagerEnabled)} set to false)"); - return; } if (_logger.IsDebug) _logger.Debug("Initializing peer manager"); diff --git a/src/Nethermind/Nethermind.Secp256k1.Test/Nethermind.Secp256k1.Test.csproj b/src/Nethermind/Nethermind.Secp256k1.Test/Nethermind.Secp256k1.Test.csproj index d0c0f56b84f..cd547ac6623 100644 --- a/src/Nethermind/Nethermind.Secp256k1.Test/Nethermind.Secp256k1.Test.csproj +++ b/src/Nethermind/Nethermind.Secp256k1.Test/Nethermind.Secp256k1.Test.csproj @@ -1,6 +1,6 @@  - netcoreapp2.1 + netcoreapp2.2 false 7.2 diff --git a/src/Nethermind/Nethermind.Secp256k1/Nethermind.Secp256k1.csproj b/src/Nethermind/Nethermind.Secp256k1/Nethermind.Secp256k1.csproj index 4903720e64a..c617498eea3 100644 --- a/src/Nethermind/Nethermind.Secp256k1/Nethermind.Secp256k1.csproj +++ b/src/Nethermind/Nethermind.Secp256k1/Nethermind.Secp256k1.csproj @@ -1,6 +1,6 @@  - netcoreapp2.1 + netcoreapp2.2 7.2 diff --git a/src/Nethermind/Nethermind.Stats/Nethermind.Stats.csproj b/src/Nethermind/Nethermind.Stats/Nethermind.Stats.csproj index 2244ce32c27..da90da53563 100644 --- a/src/Nethermind/Nethermind.Stats/Nethermind.Stats.csproj +++ b/src/Nethermind/Nethermind.Stats/Nethermind.Stats.csproj @@ -1,7 +1,7 @@ - + - netcoreapp2.1 + netcoreapp2.2 diff --git a/src/Nethermind/Nethermind.Store.Rpc/Nethermind.Store.Rpc.csproj b/src/Nethermind/Nethermind.Store.Rpc/Nethermind.Store.Rpc.csproj index b008bef87b7..c54708fd928 100644 --- a/src/Nethermind/Nethermind.Store.Rpc/Nethermind.Store.Rpc.csproj +++ b/src/Nethermind/Nethermind.Store.Rpc/Nethermind.Store.Rpc.csproj @@ -1,6 +1,6 @@  - netcoreapp2.1 + netcoreapp2.2 7.2 diff --git a/src/Nethermind/Nethermind.Store.Test/Nethermind.Store.Test.csproj b/src/Nethermind/Nethermind.Store.Test/Nethermind.Store.Test.csproj index 2ad840e8f81..82a2f72ed65 100644 --- a/src/Nethermind/Nethermind.Store.Test/Nethermind.Store.Test.csproj +++ b/src/Nethermind/Nethermind.Store.Test/Nethermind.Store.Test.csproj @@ -1,6 +1,6 @@  - netcoreapp2.1 + netcoreapp2.2 false 7.2 diff --git a/src/Nethermind/Nethermind.Store/Nethermind.Store.csproj b/src/Nethermind/Nethermind.Store/Nethermind.Store.csproj index e08f8890ee9..b439c71d08e 100644 --- a/src/Nethermind/Nethermind.Store/Nethermind.Store.csproj +++ b/src/Nethermind/Nethermind.Store/Nethermind.Store.csproj @@ -1,6 +1,6 @@  - netcoreapp2.1 + netcoreapp2.2 7.2 diff --git a/src/Nethermind/Nethermind.Wallet.Test/Nethermind.Wallet.Test.csproj b/src/Nethermind/Nethermind.Wallet.Test/Nethermind.Wallet.Test.csproj index 458d6936743..61d3143c80c 100644 --- a/src/Nethermind/Nethermind.Wallet.Test/Nethermind.Wallet.Test.csproj +++ b/src/Nethermind/Nethermind.Wallet.Test/Nethermind.Wallet.Test.csproj @@ -1,6 +1,6 @@  - netcoreapp2.1 + netcoreapp2.2 false diff --git a/src/Nethermind/Nethermind.Wallet/Nethermind.Wallet.csproj b/src/Nethermind/Nethermind.Wallet/Nethermind.Wallet.csproj index 32a41c93b87..d475c69d078 100644 --- a/src/Nethermind/Nethermind.Wallet/Nethermind.Wallet.csproj +++ b/src/Nethermind/Nethermind.Wallet/Nethermind.Wallet.csproj @@ -1,6 +1,6 @@  - netcoreapp2.1 + netcoreapp2.2 7.2 diff --git a/src/rocksdb-sharp b/src/rocksdb-sharp index 37de4242ffc..1242bbef3df 160000 --- a/src/rocksdb-sharp +++ b/src/rocksdb-sharp @@ -1 +1 @@ -Subproject commit 37de4242ffc55bcdfa36ee288d7664ec9f62ed19 +Subproject commit 1242bbef3dfe3823ab29b9ee0d136e4010acced3