From 6e1f7081293a302a700547d96dbe1bf5af093541 Mon Sep 17 00:00:00 2001 From: Erik Zhang Date: Sun, 1 Aug 2021 16:54:10 +0800 Subject: [PATCH 1/3] 3.0.0 (#617) --- src/Directory.Build.props | 3 +-- src/OracleService/OracleService.csproj | 2 +- src/OracleService/Protocols/OracleNeoFSProtocol.cs | 6 +++--- tests/Neo.Network.RPC.Tests/Neo.Network.RPC.Tests.csproj | 2 +- 4 files changed, 6 insertions(+), 7 deletions(-) diff --git a/src/Directory.Build.props b/src/Directory.Build.props index 4033ad227..b58a7e0f7 100644 --- a/src/Directory.Build.props +++ b/src/Directory.Build.props @@ -3,7 +3,6 @@ 3.0.0 - rc4 net5.0 Neo.Plugins The Neo Project @@ -15,7 +14,7 @@ - + diff --git a/src/OracleService/OracleService.csproj b/src/OracleService/OracleService.csproj index 1bcdcff9c..8af131d24 100644 --- a/src/OracleService/OracleService.csproj +++ b/src/OracleService/OracleService.csproj @@ -6,7 +6,7 @@ - + diff --git a/src/OracleService/Protocols/OracleNeoFSProtocol.cs b/src/OracleService/Protocols/OracleNeoFSProtocol.cs index 9e6cef475..ed18635d8 100644 --- a/src/OracleService/Protocols/OracleNeoFSProtocol.cs +++ b/src/OracleService/Protocols/OracleNeoFSProtocol.cs @@ -64,14 +64,14 @@ private Task GetAsync(Uri uri, string host, CancellationToken cancellati { string[] ps = uri.AbsolutePath.Split("/"); if (ps.Length < 2) throw new FormatException("Invalid neofs url"); - ContainerID containerID = ContainerID.FromBase58String(ps[0]); - ObjectID objectID = ObjectID.FromBase58String(ps[1]); + ContainerID containerID = ContainerID.FromString(ps[0]); + ObjectID objectID = ObjectID.FromString(ps[1]); Address objectAddr = new() { ContainerId = containerID, ObjectId = objectID }; - Client client = new(privateKey, host); + using Client client = new(privateKey, host); var tokenSource = CancellationTokenSource.CreateLinkedTokenSource(cancellation); tokenSource.CancelAfter(Settings.Default.NeoFS.Timeout); if (ps.Length == 2) diff --git a/tests/Neo.Network.RPC.Tests/Neo.Network.RPC.Tests.csproj b/tests/Neo.Network.RPC.Tests/Neo.Network.RPC.Tests.csproj index 000b6dcd8..ee1ea1b82 100644 --- a/tests/Neo.Network.RPC.Tests/Neo.Network.RPC.Tests.csproj +++ b/tests/Neo.Network.RPC.Tests/Neo.Network.RPC.Tests.csproj @@ -7,7 +7,7 @@ - + From 2aac8693fcdd2054b26a91d6bbc1c7d4a5c6481c Mon Sep 17 00:00:00 2001 From: Erik Zhang Date: Sun, 1 Aug 2021 21:30:43 +0800 Subject: [PATCH 2/3] Fix default network number (#619) --- src/ApplicationLogs/ApplicationLogs/config.json | 2 +- src/DBFTPlugin/DBFTPlugin/config.json | 2 +- src/OracleService/OracleService/config.json | 2 +- src/RpcNep17Tracker/RpcNep17Tracker/config.json | 2 +- src/RpcServer/RpcServer/config.json | 2 +- src/StateService/StateService/config.json | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/ApplicationLogs/ApplicationLogs/config.json b/src/ApplicationLogs/ApplicationLogs/config.json index 52c1560a3..bd8d23d57 100644 --- a/src/ApplicationLogs/ApplicationLogs/config.json +++ b/src/ApplicationLogs/ApplicationLogs/config.json @@ -1,6 +1,6 @@ { "PluginConfiguration": { "Path": "ApplicationLogs_{0}", - "Network": 5195086 + "Network": 860833102 } } diff --git a/src/DBFTPlugin/DBFTPlugin/config.json b/src/DBFTPlugin/DBFTPlugin/config.json index a1baeb699..9ec3e4957 100644 --- a/src/DBFTPlugin/DBFTPlugin/config.json +++ b/src/DBFTPlugin/DBFTPlugin/config.json @@ -3,7 +3,7 @@ "RecoveryLogs": "ConsensusState", "IgnoreRecoveryLogs": false, "AutoStart": false, - "Network": 5195086, + "Network": 860833102, "MaxBlockSize": 262144, "MaxBlockSystemFee": 900000000000 } diff --git a/src/OracleService/OracleService/config.json b/src/OracleService/OracleService/config.json index 7bad690bb..7663ad355 100644 --- a/src/OracleService/OracleService/config.json +++ b/src/OracleService/OracleService/config.json @@ -1,6 +1,6 @@ { "PluginConfiguration": { - "Network": 5195086, + "Network": 860833102, "Nodes": [], "MaxTaskTimeout": 432000000, "AllowPrivateHost": false, diff --git a/src/RpcNep17Tracker/RpcNep17Tracker/config.json b/src/RpcNep17Tracker/RpcNep17Tracker/config.json index 2134dea7a..35b02c4c6 100644 --- a/src/RpcNep17Tracker/RpcNep17Tracker/config.json +++ b/src/RpcNep17Tracker/RpcNep17Tracker/config.json @@ -4,6 +4,6 @@ "TrackHistory": true, "RecordNullAddressHistory": false, "MaxResults": 1000, - "Network": 5195086 + "Network": 860833102 } } diff --git a/src/RpcServer/RpcServer/config.json b/src/RpcServer/RpcServer/config.json index 0f65fdde4..ac7d96b27 100644 --- a/src/RpcServer/RpcServer/config.json +++ b/src/RpcServer/RpcServer/config.json @@ -2,7 +2,7 @@ "PluginConfiguration": { "Servers": [ { - "Network": 5195086, + "Network": 860833102, "BindAddress": "127.0.0.1", "Port": 10332, "SslCert": "", diff --git a/src/StateService/StateService/config.json b/src/StateService/StateService/config.json index 25f903754..991ac91c2 100644 --- a/src/StateService/StateService/config.json +++ b/src/StateService/StateService/config.json @@ -2,7 +2,7 @@ "PluginConfiguration": { "Path": "Data_MPT_{0}", "FullState": false, - "Network": 5195086, + "Network": 860833102, "AutoVerify": false } } From ef59a0eb27fb23c49610c0362e1fe7d9d0ec7839 Mon Sep 17 00:00:00 2001 From: Owen Zhang <38493437+superboyiii@users.noreply.github.com> Date: Tue, 3 Aug 2021 23:40:31 +0800 Subject: [PATCH 3/3] 3.0.1 (#621) * 3.0.1 * Update NeoFS.API Co-authored-by: Erik Zhang --- src/Directory.Build.props | 4 ++-- src/OracleService/OracleService.csproj | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/Directory.Build.props b/src/Directory.Build.props index b58a7e0f7..71da12ce8 100644 --- a/src/Directory.Build.props +++ b/src/Directory.Build.props @@ -2,7 +2,7 @@ - 3.0.0 + 3.0.1 net5.0 Neo.Plugins The Neo Project @@ -14,7 +14,7 @@ - + diff --git a/src/OracleService/OracleService.csproj b/src/OracleService/OracleService.csproj index 8af131d24..bbcf29731 100644 --- a/src/OracleService/OracleService.csproj +++ b/src/OracleService/OracleService.csproj @@ -6,7 +6,7 @@ - +