Merge branch 'bench_tests' into develop

vergecurrency · Feb 24, 2019 · efc7e3b · efc7e3b
2 parents b508db7 + 27431d1
commit efc7e3b
Show file tree

Hide file tree

Showing 10 changed files with 738 additions and 367 deletions.
diff --git a/src/Makefile.am b/src/Makefile.am
@@ -193,6 +193,7 @@ VERGE_CORE_H = \
   validation.h \
   validationinterface.h \
   versionbits.h \
+  versionbitsinfo.h \
   torcontroller.h \
   walletinitinterface.h \
   wallet/coincontrol.h \
@@ -450,6 +451,7 @@ libverge_common_a_SOURCES = \
   script/ismine.cpp \
   script/sign.cpp \
   script/standard.cpp \
+  versionbitsinfo.cpp \
   warnings.cpp \
   stealth.cpp \
   $(VERGE_CORE_H)

diff --git a/src/init.cpp b/src/init.cpp
@@ -45,6 +45,7 @@
 #include <util/system.h>
 #include <util/moneystr.h>
 #include <validationinterface.h>
+#include <versionbitsinfo.h>
 #include <warnings.h>
 #include <walletinitinterface.h>
 #include <stdint.h>

diff --git a/src/netaddress.h b/src/netaddress.h
@@ -57,8 +57,8 @@ class CNetAddr
           * Useful for mapping resolved addresses back to their source.
          */
         bool SetInternal(const std::string& name);
-
         bool SetSpecial(const std::string &strName); // for Tor & i2p addresses
+		    bool IsBindAny() const; // INADDR_ANY equivalent
         bool IsIPv4() const;    // IPv4 mapped address (::FFFF:0:0/96, 0.0.0.0/0)
         bool IsIPv6() const;    // IPv6 address (not mapped IPv4, not Tor/i2p)
         bool IsRFC1918() const; // IPv4 private networks (10.0.0.0/8, 192.168.0.0/16, 172.16.0.0/12)