updates

blaketrader · Dec 13, 2015 · 183af8a · 183af8a
1 parent bc727e5
commit 183af8a
Show file tree

Hide file tree

Showing 6 changed files with 56 additions and 36 deletions.
diff --git a/Electron-qt.pro b/Electron-qt.pro
@@ -1,10 +1,10 @@
 TEMPLATE = app
 TARGET = electron-qt
 macx:TARGET = "Electron-Qt"
-VERSION = 0.8.9.5
+VERSION = 0.8.9.6
 INCLUDEPATH += src src/json src/qt
 QT += core gui network
-DEFINES += QT_GUI BOOST_THREAD_USE_LIB BOOST_SPIRIT_THREADSAFE 
+#DEFINES += QT_GUI BOOST_THREAD_USE_LIB BOOST_SPIRIT_THREADSAFE BOOST_THREAD_PROVIDES_GENERIC_SHARED_MUTEX_ON_WIN __NO_SYSTEM_INCLUDES
 greaterThan(QT_MAJOR_VERSION, 4): QT += widgets
 DEFINES += QT_GUI BOOST_THREAD_USE_LIB BOOST_SPIRIT_THREADSAFE
 CONFIG += no_include_pwd
@@ -24,20 +24,20 @@ CONFIG += static
 windows:LIBS += -lshlwapi
 LIBS += $$join(BOOST_LIB_PATH,,-L,) $$join(BDB_LIB_PATH,,-L,) $$join(OPENSSL_LIB_PATH,,-L,) $$join(QRENCODE_LIB_PATH,,-L,)
 LIBS += -lssl -lcrypto -ldb_cxx$$BDB_LIB_SUFFIX
-LIBS += -lboost_system-mgw48-mt-s-1_55 -lboost_filesystem-mgw48-mt-s-1_55 -lboost_program_options-mgw48-mt-s-1_55 -lboost_thread-mgw48-mt-s-1_55
-#BOOST_LIB_SUFFIX=-mgw48-mt-s-1_55
-#BOOST_INCLUDE_PATH=C:/deps/boost_1_55_0
-#BOOST_LIB_PATH=C:/deps/boost_1_55_0/stage/lib
-#BDB_INCLUDE_PATH=C:/deps/db-4.8.30.NC/build_unix
-#BDB_LIB_PATH=C:/deps/db-4.8.30.NC/build_unix
-#OPENSSL_INCLUDE_PATH=C:/deps/openssl-1.0.2d/include
-#OPENSSL_LIB_PATH=C:/deps/openssl-1.0.2d
-#MINIUPNPC_LIB_SUFFIX=-miniupnpc
-#MINIUPNPC_INCLUDE_PATH=C:/deps/miniupnpc
-#MINIUPNPC_LIB_PATH=C:/deps/miniupnpc
-#QRENCODE_INCLUDE_PATH=C:/deps/qrencode-3.4.4
-#QRENCODE_LIB_PATH=C:/deps/qrencode-3.4.4/.libs
-#LIBPNG_INCLUDE_PATH=C:/deps/libpng-1.6.14
+LIBS += -lboost_system-mgw49-mt-s-1_55 -lboost_filesystem-mgw49-mt-s-1_55 -lboost_program_options-mgw49-mt-s-1_55 -lboost_thread-mgw49-mt-s-1_55
+BOOST_LIB_SUFFIX=-mgw49-mt-s-1_55
+BOOST_INCLUDE_PATH=C:/deps/boost_1_55_0
+BOOST_LIB_PATH=C:/deps/boost_1_55_0/stage/lib
+BDB_INCLUDE_PATH=C:/deps/db-4.8.30.NC/build_unix
+BDB_LIB_PATH=C:/deps/db-4.8.30.NC/build_unix
+OPENSSL_INCLUDE_PATH=C:/deps/openssl-1.0.2e/include
+OPENSSL_LIB_PATH=C:/deps/openssl-1.0.2e
+MINIUPNPC_LIB_SUFFIX=-miniupnpc
+MINIUPNPC_INCLUDE_PATH=C:/deps/miniupnpc
+MINIUPNPC_LIB_PATH=C:/deps/miniupnpc
+QRENCODE_INCLUDE_PATH=C:/deps/qrencode-3.4.4
+QRENCODE_LIB_PATH=C:/deps/qrencode-3.4.4/.libs
+LIBPNG_INCLUDE_PATH=C:/deps/libpng-1.6.20
 # End of Windows Paths
 
 OBJECTS_DIR = build
@@ -70,11 +70,13 @@ contains(RELEASE, 1) {
 #QMAKE_CXXFLAGS *= -D_FORTIFY_SOURCE=2
 QMAKE_CXXFLAGS += -U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=2
 # for extra security on Windows: enable ASLR and DEP via GCC linker flags
-win32:QMAKE_LFLAGS *= -Wl,--dynamicbase -Wl,--nxcompat
+#win32:QMAKE_LFLAGS *= -Wl,--dynamicbase -Wl,--nxcompat
 # on Windows: enable GCC large address aware linker flag
-win32:QMAKE_LFLAGS *= -Wl,--large-address-aware -static
+#win32:QMAKE_LFLAGS *= -Wl,--large-address-aware
+#win32:QMAKE_LFLAGS *= -Wl,--large-address-aware -static
 # i686-w64-mingw32
-win32:QMAKE_LFLAGS *= -static-libgcc -static-libstdc++ -static
+#win32:QMAKE_LFLAGS *= -static-libgcc -static-libstdc++ -static
+win32:QMAKE_LFLAGS *= -static-libgcc -static-libstdc++
 
 # use: qmake "USE_QRCODE=1"
 # libqrencode (http://fukuchi.org/works/qrencode/index.en.html) must be installed for support
@@ -385,7 +387,7 @@ OTHER_FILES += README.md \
 # platform specific defaults, if not overridden on command line
 isEmpty(BOOST_LIB_SUFFIX) {
     macx:BOOST_LIB_SUFFIX = -mt
-    win32:BOOST_LIB_SUFFIX = -mgw48-mt-s-1_55
+    win32:BOOST_LIB_SUFFIX = -mgw49-mt-s-1_55
 }
 
 isEmpty(BOOST_THREAD_LIB_SUFFIX) {

diff --git a/src/checkpoints.cpp b/src/checkpoints.cpp
@@ -37,19 +37,20 @@ namespace Checkpoints
         boost::assign::map_list_of
 		( 0, uint256("0x00000063044a9b6cad9015b289de8a86a654d5a916fcaaeeefb5b9408448df40"))
 		( 25550, uint256("0xe8b6e0cfda9a65717ac300d5e1222bbbe45439d13cb9b681c77b775f77d8ec09"))
-                ( 107785, uint256("0x0c57a0c979d324a667563d417eabc0a72d3710a70b92fb5541f776f48e50766b"))
-                ( 194686, uint256("0x591461dfbaedcb23a96d2b8ce5b202ebb501bae203817c060bc44dafd563cbba"))
+        ( 107785, uint256("0x0c57a0c979d324a667563d417eabc0a72d3710a70b92fb5541f776f48e50766b"))
+        ( 194686, uint256("0x591461dfbaedcb23a96d2b8ce5b202ebb501bae203817c060bc44dafd563cbba"))
 		( 268428, uint256("0x0000000000052546b3b71130b7795cfe200d9a3d2b61fcd3fcc3e3cb5b668789"))
-	        ( 371000, uint256("0x000000000000c18f5062e45073251ede9f9ebffbd4d1fdd09e3c33553b3b93da"))
-                ( 415000, uint256("0x00000000000b69fca351b7ea2f766170faf87897d81b1a34fb67f0bd0dbdd50e"))
-	        ( 580000, uint256("0x00000000000e0231682f8235d0207b5e8dee5a54d9ce7d13a607667a60779214"))
-	        ( 628199, uint256("0xca8c5ff1d964ee60e0d1168e7929d067d26953183248e6d95585c7c2d0a09193"))
+	    ( 371000, uint256("0x000000000000c18f5062e45073251ede9f9ebffbd4d1fdd09e3c33553b3b93da"))
+        ( 415000, uint256("0x00000000000b69fca351b7ea2f766170faf87897d81b1a34fb67f0bd0dbdd50e"))
+	    ( 580000, uint256("0x00000000000e0231682f8235d0207b5e8dee5a54d9ce7d13a607667a60779214"))
+	    ( 628199, uint256("0xca8c5ff1d964ee60e0d1168e7929d067d26953183248e6d95585c7c2d0a09193"))
+	    ( 804089, uint256("04ce136ef781ec8860960acceb96e573648c220cf601ccb92e380926ea668c4a9"))
 
 	        ;
     static const CCheckpointData data = {
         &mapCheckpoints,
-        1439388036, // * UNIX timestamp of last checkpoint block
-        916063,     // * total number of transactions between genesis and last checkpoint
+        1450015468, // * UNIX timestamp of last checkpoint block
+        1125536,     // * total number of transactions between genesis and last checkpoint
                     //   (the tx=... number in the SetBestChain debug.log lines)
         4500.0     // * estimated number of transactions per day after checkpoint
     };

diff --git a/src/clientversion.h b/src/clientversion.h
@@ -9,7 +9,7 @@
 #define CLIENT_VERSION_MAJOR       0
 #define CLIENT_VERSION_MINOR       8
 #define CLIENT_VERSION_REVISION    9
-#define CLIENT_VERSION_BUILD       5
+#define CLIENT_VERSION_BUILD       6
 
 // Set to true for release, false for prerelease or test build
 #define CLIENT_VERSION_IS_RELEASE  true

diff --git a/src/key.cpp b/src/key.cpp
@@ -374,8 +374,25 @@ bool CKey::SetCompactSignature(uint256 hash, const std::vector<unsigned char>& v
     return false;
 }
 
-bool CKey::Verify(uint256 hash, const std::vector<unsigned char>& vchSig)
-{
+bool CKey::Verify(uint256 hash, const std::vector<unsigned char>& vchSigParam)
+ {	
+    // Prevent the problem described here: https://lists.linuxfoundation.org/pipermail/bitcoin-dev/2015-July/009697.html
+    // by removing the extra length bytes
+    std::vector<unsigned char> vchSig(vchSigParam.begin(), vchSigParam.end());
+    if (vchSig.size() > 1 && vchSig[1] & 0x80)
+    {
+        unsigned char nLengthBytes = vchSig[1] & 0x7f;
+        if (nLengthBytes > 4)
+        {
+            unsigned char nExtraBytes = nLengthBytes - 4;
+            for (unsigned char i = 0; i < nExtraBytes; i++)
+                if (vchSig[2 + i])
+                    return false;
+            vchSig.erase(vchSig.begin() + 2, vchSig.begin() + 2 + nExtraBytes);
+            vchSig[1] = 0x80 | (nLengthBytes - nExtraBytes);
+        }
+    }
+
     if (vchSig.empty())
         return false;
 

diff --git a/src/makefile.mingw b/src/makefile.mingw
@@ -21,23 +21,23 @@ USE_UPNP:=-
 USE_IPV6:=1
 
 DEPSDIR?=/usr/local
-BOOST_SUFFIX?=-mgw46-mt-sd-1_55
+BOOST_SUFFIX?=-mgw49-mt-s-1_55
 
 INCLUDEPATHS= \
  -I"$(CURDIR)" \
  -I"$(DEPSDIR)/include" \
  -I"c:/deps/boost_1_55_0" \
  -I"c:/deps/db-4.8.30.NC/build_unix" \
  -I"c:/deps/miniupnpc" \
- -I"c:/deps/openssl-1.0.2d/include"
+ -I"c:/deps/openssl-1.0.2e/include"
 
 LIBPATHS= \
  -L"$(CURDIR)/leveldb" \
  -L"$(DEPSDIR)/lib" \
  -L"c:/deps/boost_1_55_0/stage/lib" \
  -L"c:/deps/db-4.8.30.NC/build_unix" \
  -L"c:/deps/miniupnpc" \
- -L"c:/deps/openssl-1.0.2d"
+ -L"c:/deps/openssl-1.0.2e"
 
 LIBS= \
  -l leveldb \
@@ -55,7 +55,7 @@ DEFS=-D_MT -DWIN32 -D_WINDOWS -DBOOST_THREAD_USE_LIB -DBOOST_SPIRIT_THREADSAFE
 DEBUGFLAGS=-g
 CFLAGS=-mthreads -O2 -w -Wall -Wextra -Wformat -Wformat-security -Wno-unused-parameter $(DEBUGFLAGS) $(DEFS) $(INCLUDEPATHS)
 # enable: ASLR, DEP and large address aware
-LDFLAGS=-Wl,--dynamicbase -Wl,--nxcompat -Wl,--large-address-aware
+LDFLAGS=-Wl,--dynamicbase -Wl,--nxcompat -Wl,--large-address-aware -static
 
 TESTDEFS = -DTEST_DATA_DIR=$(abspath test/data)
 

diff --git a/src/version.cpp b/src/version.cpp
@@ -37,7 +37,7 @@ const std::string CLIENT_NAME("Electron");
 #define GIT_ARCHIVE 1
 #ifdef GIT_ARCHIVE
 #    define GIT_COMMIT_ID "8c5e74e"
-#    define GIT_COMMIT_DATE "2015-08-12 20:12:09 +0100"
+#    define GIT_COMMIT_DATE "2015-12-13 13:44:08 +0000"
 #endif
 
 #define BUILD_DESC_FROM_COMMIT(maj,min,rev,build,commit) \