Merge pull request #122 from pingpongsneak/master

Last RC release
cypher-network · Dec 18, 2022 · a9b39f5 · a9b39f5
2 parents 9057f2a + 41fa6e3
commit a9b39f5
Show file tree

Hide file tree

Showing 7 changed files with 17 additions and 12 deletions.
diff --git a/core/Ledger/Sync.cs b/core/Ledger/Sync.cs
@@ -285,7 +285,7 @@ private async Task<IReadOnlyList<Block>> FetchBlocksAsync(Peer peer, ulong skip,
                                 {
                                     new() { Value = iSkip.ToBytes(), ProtocolCommand = ProtocolCommand.GetBlocks },
                                     new() { Value = chunk.ToBytes(), ProtocolCommand = ProtocolCommand.GetBlocks }
-                                }), 500);
+                                }));
                             if (blocksResponse?.Blocks is null)
                             {
                                 warpTask.StopTask();

diff --git a/core/Network/Broadcast.cs b/core/Network/Broadcast.cs
@@ -79,7 +79,7 @@ protected override async Task OnReceiveAsync((TopicType, byte[]) message)
                         if (cancellationToken.IsCancellationRequested) return ValueTask.CompletedTask;
                         var _ = _cypherSystemCore.P2PDeviceReq().SendAsync<EmptyMessage>(knownPeer.IpAddress,
                             knownPeer.TcpPort,
-                            knownPeer.PublicKey, msg).SafeForgetAsync(_logger).ConfigureAwait(false);
+                            knownPeer.PublicKey, msg, 250).SafeForgetAsync(_logger).ConfigureAwait(false);
                     }
                     catch (Exception)
                     {

diff --git a/core/Network/P2PDeviceReq.cs b/core/Network/P2PDeviceReq.cs
@@ -20,7 +20,7 @@ namespace CypherNetwork.Network;
 public interface IP2PDeviceReq
 {
     Task<T> SendAsync<T>(ReadOnlyMemory<byte> ipAddress, ReadOnlyMemory<byte> tcpPort, ReadOnlyMemory<byte> publicKey,
-        ReadOnlyMemory<byte> value, int timeMs = 200, bool deserialize = true);
+        ReadOnlyMemory<byte> value, int timeMs = 0, bool deserialize = true);
 }
 
 public class EmptyMessage { }
@@ -55,7 +55,7 @@ public P2PDeviceReq(ICypherSystemCore cypherSystemCore)
     /// <returns></returns>
     /// <exception cref="Exception"></exception>
     public async Task<T> SendAsync<T>(ReadOnlyMemory<byte> ipAddress, ReadOnlyMemory<byte> tcpPort, ReadOnlyMemory<byte> publicKey,
-        ReadOnlyMemory<byte> value, int timeMs = 200, bool deserialize = true)
+        ReadOnlyMemory<byte> value, int timeMs = 0, bool deserialize = true)
     {
         var nngMsg = NngFactorySingleton.Instance.Factory.CreateMessage();
         try
@@ -73,8 +73,11 @@ public P2PDeviceReq(ICypherSystemCore cypherSystemCore)
             using var socket = NngFactorySingleton.Instance.Factory.RequesterOpen()
                 .ThenDial($"tcp://{address}:{port}", Defines.NngFlag.NNG_FLAG_NONBLOCK).Unwrap();
 
-            socket.SetOpt(Defines.NNG_OPT_RECVTIMEO, new nng_duration { TimeMs = timeMs });
-            socket.SetOpt(Defines.NNG_OPT_SENDTIMEO, new nng_duration { TimeMs = timeMs });
+            if (timeMs != 0)
+            {
+                socket.SetOpt(Defines.NNG_OPT_RECVTIMEO, new nng_duration { TimeMs = timeMs });
+                socket.SetOpt(Defines.NNG_OPT_SENDTIMEO, new nng_duration { TimeMs = timeMs });
+            }
 
             using var ctx = socket.CreateAsyncContext(NngFactorySingleton.Instance.Factory).Unwrap();
             var cipher = _cypherSystemCore.Crypto().BoxSeal(value.Span, publicKey.Span[1..33]);

diff --git a/core/Network/PeerDiscovery.cs b/core/Network/PeerDiscovery.cs
@@ -61,7 +61,7 @@ public interface IPeerDiscovery
 /// </summary>
 public sealed class PeerDiscovery : IDisposable, IPeerDiscovery
 {
-    private const int PrunedTimeoutFromSeconds = 30;
+    private const int PrunedTimeoutFromSeconds = 120;
     private const int SurveyorWaitTimeMilliseconds = 2500;
     private const int ReceiveWaitTimeMilliseconds = 1000;
     private readonly Caching<Peer> _caching = new();
@@ -378,7 +378,7 @@ private async Task OnReadyAsync()
                 }
                 finally
                 {
-                    if (peer.Timestamp < Util.GetUtcNow().AddSeconds(-30).ToUnixTimestamp())
+                    if (peer.Timestamp < Util.GetUtcNow().AddSeconds(-PrunedTimeoutFromSeconds).ToUnixTimestamp())
                     {
                         SetPeerCooldown(new PeerCooldown
                         {
@@ -461,7 +461,8 @@ private async Task ReceivedPeersAsync(INngMsgPart nngMsg)
             if (!cachedPeer.IsDefault())
             {
                 if (cachedPeer.Timestamp >= peer.Timestamp) continue;
-                UpdatePeer(peer.ClientId, peer.IpAddress, peer);
+                // ReSharper disable once RedundantAssignment
+                cachedPeer = peer;
                 continue;
             }
 

diff --git a/core/Wallet/Wallet.cs b/core/Wallet/Wallet.cs
@@ -335,12 +335,13 @@ private bool IsSpent(Output output, IWalletSession session)
         Guard.Argument(m, nameof(m)).NotNull().NotEmpty();
         using var pedersen = new Pedersen();
         using var secp256K1 = new Secp256k1();
-        var (spendKey, scanKey) = Unlock();
         var transactions = session.GetSafeGuardBlocks()
             .SelectMany(x => x.Txs).ToArray();
         if (transactions.Any() != true) return null;
         transactions.Shuffle();
 
+        var (spendKey, scanKey) = Unlock();
+
         for (var k = 0; k < nRows - 1; ++k)
             for (var i = 0; i < nCols; ++i)
             {

diff --git a/core/core.csproj b/core/core.csproj
@@ -4,7 +4,7 @@
         <TargetFramework>net6.0</TargetFramework>
         <Platforms>AnyCPU;x64</Platforms>
         <RootNamespace>CypherNetwork</RootNamespace>
-        <AssemblyVersion>0.0.75.0</AssemblyVersion>
+        <AssemblyVersion>0.0.76.0</AssemblyVersion>
         <Company>CypherNetwork</Company>
         <PackageId>core</PackageId>
         <AssemblyName>cyphernetworkcore</AssemblyName>

diff --git a/node/node.csproj b/node/node.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup> 
     <ServerGarbageCollection>true</ServerGarbageCollection> 
-    <AssemblyVersion>0.0.75.0</AssemblyVersion> 
+    <AssemblyVersion>0.0.76.0</AssemblyVersion> 
     <NeutralLanguage>en</NeutralLanguage> 
     <PackageId>node</PackageId>
   </PropertyGroup>