Merge branch 'master' of https://github.com/NethermindEth/nethermind

NethermindEth · Oct 26, 2021 · 76b7f08 · 76b7f08
2 parents 966b7a4 + d209d15
commit 76b7f08
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 4 deletions.
diff --git a/src/Nethermind/Nethermind.Network.Test/ProtocolsManagerTests.cs b/src/Nethermind/Nethermind.Network.Test/ProtocolsManagerTests.cs
@@ -260,10 +260,10 @@ public Context ReceiveHelloNoEth()
                 return this;
             }
 
-            public Context ReceiveHelloWrongEth()
+            public Context ReceiveHelloEth(int protocolVersion)
             {
                 HelloMessage msg = new HelloMessage();
-                msg.Capabilities = new List<Capability> {new Capability("eth", 61)};
+                msg.Capabilities = new List<Capability> {new Capability("eth", protocolVersion)};
                 msg.NodeId = TestItem.PublicKeyB;
                 msg.ClientId = "other client v1";
                 msg.P2PVersion = 5;
@@ -272,6 +272,12 @@ public Context ReceiveHelloWrongEth()
                 return this;
             }
 
+
+            public Context ReceiveHelloWrongEth()
+            {
+                return ReceiveHelloEth(61);
+            }
+
             public Context ReceiveStatusWrongChain()
             {
                 StatusMessage msg = new StatusMessage();
@@ -450,7 +456,7 @@ public void Disconnects_on_wrong_eth()
                 .ReceiveHelloWrongEth()
                 .VerifyDisconnected();
         }
-        
+
         [Test]
         public void Disconnects_on_wrong_chain_id()
         {
@@ -478,5 +484,18 @@ public void Disconnects_on_wrong_genesis_hash()
                 .ReceiveStatusWrongGenesis()
                 .VerifyDisconnected();
         }
+
+        [Test]
+        public void Initialized_with_eth66_only()
+        {
+            When
+                .CreateIncomingSession()
+                .ActivateChannel()
+                .Handshake()
+                .Init()
+                .VerifyInitialized()
+                .ReceiveHelloEth(66)
+                .VerifyInitialized();
+        }
     }
 }
diff --git a/src/Nethermind/Nethermind.Network/ProtocolValidator.cs b/src/Nethermind/Nethermind.Network/ProtocolValidator.cs
@@ -112,7 +112,8 @@ private bool ValidateCapabilities(IEnumerable<Capability> capabilities)
                     x.Version == 62 || 
                     x.Version == 63 || 
                     x.Version == 64 || 
-                    x.Version == 65));
+                    x.Version == 65 ||
+                    x.Version == 66));
         }
 
         private bool ValidateChainId(ulong chainId)