Merge remote-tracking branch 'origin/release/1.4'

Author: chfast

.bumpversion.cfg

@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 1.5.0.dev1
+current_version = 1.4.0rc3
 tag = True
 commit = True
 message = Aleth {new_version}

CMakeLists.txt

@@ -41,7 +41,7 @@ HunterGate(
 )
 
 project(aleth)
-set(PROJECT_VERSION 1.5.0.dev1)
+set(PROJECT_VERSION 1.4.0rc3)
 
 if (NOT EXISTS ${CMAKE_SOURCE_DIR}/evmjit/.git)
     message(FATAL_ERROR "Git submodules not initialized, execute:\n  git submodule update --init")

circle.yml

@@ -230,7 +230,7 @@ jobs:
           name: "Create GitHub release"
           command: |
             prerelease_flag=$([[ $CIRCLE_TAG =~ ^v[0-9\.]+$ ]] || echo '-prerelease')
-            ghr -u ethereum -r cpp-ethereum $prerelease_flag $CIRCLE_TAG ~/package
+            ghr -u ethereum -r aleth $prerelease_flag $CIRCLE_TAG ~/package
 
   # Builds aleth docker image and uploads it to Docker Hub.
   docker-aleth: &docker-aleth

hera

@@ -28,7 +28,7 @@
 #endif
 
 #if ETH_HERA
-#include <hera.h>
+#include <hera/hera.h>
 #endif
 
 namespace po = boost::program_options;

libevm/VMFactory.cpp

@@ -527,6 +527,12 @@ void Host::addNode(NodeID const& _node, NodeIPEndpoint const& _endpoint)
         else
             return;
 
+    if (_node == id())
+    {
+        cnetdetails << "Ingoring the request to connect to self " << _node;
+        return;
+    }
+
     if (_endpoint.tcpPort() < 30300 || _endpoint.tcpPort() > 30305)
         cnetdetails << "Non-standard port being recorded: " << _endpoint.tcpPort();
 
@@ -543,6 +549,12 @@ void Host::requirePeer(NodeID const& _n, NodeIPEndpoint const& _endpoint)
     if (!m_run)
         return;
 
+    if (_n == id())
+    {
+        cnetdetails << "Ingoring the request to connect to self " << _n;
+        return;
+    }
+
     Node node(_n, _endpoint, PeerType::Required);
     if (_n)
     {