Code update

README.md

@@ -16,8 +16,4 @@ Stones will generate if held and not moved for more than ~8.8 Days.
 
 Forum https://bitcointalk.org/index.php?topic=830427.0
 
-HomePage: http://philosopherstones.org/
-
-Community Channel: http://philosopherstones.org/channel
-
-Explorer: http://philosopherstones.org/block/
+HomePage: http://phs.ovh/

philosopherstone-qt.pro

@@ -1,25 +1,26 @@
 TEMPLATE = app
 TARGET = philosopherstone-qt
-VERSION = 0.7.5
+VERSION = 1.6.7
 QT += core gui network
 INCLUDEPATH += src src/json src/qt
-DEFINES += QT_GUI BOOST_THREAD_USE_LIB BOOST_SPIRIT_THREADSAFE BOOST_THREAD_PROVIDES_GENERIC_SHARED_MUTEX_ON_WIN __NO_SYSTEM_INCLUDES
+DEFINES += QT_GUI BOOST_THREAD_USE_LIB BOOST_SPIRIT_THREADSAFE __STDC_FORMAT_MACROS __STDC_LIMIT_MACROS
 CONFIG += no_include_pwd
 CONFIG += thread
 CONFIG += static
 greaterThan(QT_MAJOR_VERSION, 4): QT += widgets
 
-BOOST_LIB_SUFFIX=-mgw71-mt-s-1_64
-BOOST_INCLUDE_PATH=D:/deps/x64/boost_1_64_0
-BOOST_LIB_PATH=D:/deps/x64/boost_1_64_0/stage/lib
-BDB_INCLUDE_PATH=D:/deps/x64/db-6.2.32/build_unix
-BDB_LIB_PATH=D:/deps/x64/db-6.2.32/build_unix
-OPENSSL_INCLUDE_PATH=D:/deps/x64/openssl-1.0.2l/include
-OPENSSL_LIB_PATH=D:/deps/x64/openssl-1.0.2l
-QRENCODE_INCLUDE_PATH=D:/deps/x64/qrencode-3.4.4
-QRENCODE_LIB_PATH=D:/deps/x64/qrencode-3.4.4/.libs
-
 # UNCOMMENT THIS SECTION TO BUILD ON WINDOWS
+# Change paths if needed
+
+#BOOST_LIB_SUFFIX=-mgw71-mt-s-1_64
+#BOOST_INCLUDE_PATH=D:/deps/x64/boost_1_64_0
+#BOOST_LIB_PATH=D:/deps/x64/boost_1_64_0/stage/lib
+#BDB_INCLUDE_PATH=D:/deps/x64/db-6.2.32/build_unix
+#BDB_LIB_PATH=D:/deps/x64/db-6.2.32/build_unix
+#OPENSSL_INCLUDE_PATH=D:/deps/x64/openssl-1.0.2l/include
+#OPENSSL_LIB_PATH=D:/deps/x64/openssl-1.0.2l
+#QRENCODE_INCLUDE_PATH=D:/deps/x64/qrencode-3.4.4
+#QRENCODE_LIB_PATH=D:/deps/x64/qrencode-3.4.4/.libs
 
 OBJECTS_DIR = build
 MOC_DIR = build
@@ -44,9 +45,8 @@ QMAKE_LFLAGS *= -fstack-protector-all --param ssp-buffer-size=1
 # This can be enabled for Windows, when we switch to MinGW >= 4.4.x.
 }
 # for extra security on Windows: enable ASLR and DEP via GCC linker flags
-win32:QMAKE_LFLAGS *= -Wl,--dynamicbase -Wl,--nxcompat
-# on Windows: enable GCC large address aware linker flag
-win32:QMAKE_LFLAGS *= -Wl,-static
+windows:QMAKE_LFLAGS *= -Wl,--dynamicbase -Wl,--nxcompat
+windows:QMAKE_LFLAGS += -static-libgcc -static-libstdc++ -static -pthread
 
 # use: qmake "USE_QRCODE=1"
 # libqrencode (http://fukuchi.org/works/qrencode/index.en.html) must be installed for support
@@ -100,7 +100,7 @@ SOURCES += src/txdb-leveldb.cpp
         QMAKE_RANLIB = $$replace(QMAKE_STRIP, strip, ranlib)
     }
     LIBS += -lshlwapi
-    #genleveldb.commands = cd $$PWD/src/leveldb && CC=$$QMAKE_CC CXX=$$QMAKE_CXX TARGET_OS=OS_WINDOWS_CROSSCOMPILE $(MAKE) OPT=\"$$QMAKE_CXXFLAGS $$QMAKE_CXXFLAGS_RELEASE\" libleveldb.a libmemenv.a && $$QMAKE_RANLIB $$PWD/src/leveldb/libleveldb.a && $$QMAKE_RANLIB $$PWD/src/leveldb/libmemenv.a
+    genleveldb.commands = cd $$PWD/src/leveldb && CC=$$QMAKE_CC CXX=$$QMAKE_CXX TARGET_OS=OS_WINDOWS_CROSSCOMPILE $(MAKE) OPT=\"$$QMAKE_CXXFLAGS $$QMAKE_CXXFLAGS_RELEASE\" libleveldb.a libmemenv.a && $$QMAKE_RANLIB $$PWD/src/leveldb/libleveldb.a && $$QMAKE_RANLIB $$PWD/src/leveldb/libmemenv.a
 }
 genleveldb.target = $$PWD/src/leveldb/libleveldb.a
 genleveldb.depends = FORCE
@@ -344,7 +344,7 @@ OTHER_FILES += \
 # platform specific defaults, if not overridden on command line
 isEmpty(BOOST_LIB_SUFFIX) {
     macx:BOOST_LIB_SUFFIX = -mt
-    windows:BOOST_LIB_SUFFIX = -mgw71-mt-s-1_57
+    windows:BOOST_LIB_SUFFIX = -mt
 }
 
 isEmpty(BOOST_THREAD_LIB_SUFFIX) {
@@ -403,8 +403,7 @@ LIBS += $$join(BOOST_LIB_PATH,,-L,) $$join(BDB_LIB_PATH,,-L,) $$join(OPENSSL_LIB
 LIBS += -lssl -lcrypto -ldb_cxx$$BDB_LIB_SUFFIX
 # -lgdi32 has to happen after -lcrypto (see  #681)
 windows:LIBS += -lws2_32 -lshlwapi -lmswsock -lole32 -loleaut32 -luuid -lgdi32
-LIBS += -lboost_system$$BOOST_LIB_SUFFIX -lboost_filesystem$$BOOST_LIB_SUFFIX -lboost_program_options$$BOOST_LIB_SUFFIX -lboost_thread$$BOOST_THREAD_LIB_SUFFIX
-windows:LIBS += -lboost_chrono$$BOOST_LIB_SUFFIX
+LIBS += -lboost_system$$BOOST_LIB_SUFFIX -lboost_filesystem$$BOOST_LIB_SUFFIX -lboost_program_options$$BOOST_LIB_SUFFIX -lboost_chrono$$BOOST_LIB_SUFFIX -lboost_thread$$BOOST_THREAD_LIB_SUFFIX
 
 contains(RELEASE, 1) {
     !windows:!macx {

src/alert.cpp

@@ -56,8 +56,8 @@ std::string CUnsignedAlert::ToString() const
     return strprintf(
         "CAlert(\n"
         "    nVersion     = %d\n"
-        "    nRelayUntil  = %"PRI64d"\n"
-        "    nExpiration  = %"PRI64d"\n"
+        "    nRelayUntil  = %" PRI64d "\n"
+        "    nExpiration  = %" PRI64d "\n"
         "    nID          = %d\n"
         "    nCancel      = %d\n"
         "    setCancel    = %s\n"

src/base58.h

@@ -49,7 +49,7 @@ inline std::string EncodeBase58(const unsigned char* pbegin, const unsigned char
     CBigNum rem;
     while (bn > bn0)
     {
-        if (!BN_div(&dv, &rem, &bn, &bn58, pctx))
+        if (!BN_div(dv.get(), rem.get(), bn.cget(), bn58.cget(), pctx))
             throw bignum_error("EncodeBase58 : BN_div failed");
         bn = dv;
         unsigned int c = rem.getulong();
@@ -96,7 +96,7 @@ inline bool DecodeBase58(const char* psz, std::vector<unsigned char>& vchRet)
             break;
         }
         bnChar.setulong(p1 - pszBase58);
-        if (!BN_mul(&bn, &bn, &bn58, pctx))
+        if (!BN_mul(bn.get(), bn.cget(), bn58.cget(), pctx))
             throw bignum_error("DecodeBase58 : BN_mul failed");
         bn += bnChar;
     }