diff options
| -rw-r--r-- | configure.ac | 2 | ||||
| -rw-r--r-- | src/init.cpp | 6 | ||||
| -rw-r--r-- | src/main.cpp | 3 |
3 files changed, 4 insertions, 7 deletions
diff --git a/configure.ac b/configure.ac index 6dd03ea408..8676ed316d 100644 --- a/configure.ac +++ b/configure.ac @@ -885,7 +885,7 @@ PKGCONFIG_LIBDIR_TEMP="$PKG_CONFIG_LIBDIR" unset PKG_CONFIG_LIBDIR PKG_CONFIG_LIBDIR="$PKGCONFIG_LIBDIR_TEMP" -ac_configure_args="${ac_configure_args} --disable-shared --with-pic" +ac_configure_args="${ac_configure_args} --disable-shared --with-pic --with-bignum=no" AC_CONFIG_SUBDIRS([src/secp256k1]) AC_OUTPUT diff --git a/src/init.cpp b/src/init.cpp index 2e4740602f..35284992ed 100644 --- a/src/init.cpp +++ b/src/init.cpp @@ -787,12 +787,6 @@ bool AppInit2(boost::thread_group& threadGroup, CScheduler& scheduler) if (nConnectTimeout <= 0) nConnectTimeout = DEFAULT_CONNECT_TIMEOUT; - // Continue to put "/P2SH/" in the coinbase to monitor - // BIP16 support. - // This can be removed eventually... - const char* pszP2SH = "/P2SH/"; - COINBASE_FLAGS << std::vector<unsigned char>(pszP2SH, pszP2SH+strlen(pszP2SH)); - // Fee-per-kilobyte amount considered the same as "free" // If you are mining, be careful setting this: // if you set it to zero then diff --git a/src/main.cpp b/src/main.cpp index 99f4d49438..efb7fb3f87 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -4255,6 +4255,9 @@ bool static ProcessMessage(CNode* pfrom, string strCommand, CDataStream& vRecv, LOCK(cs_main); + if (IsInitialBlockDownload()) + return true; + CBlockIndex* pindex = NULL; if (locator.IsNull()) { |