Revert "Updates"

This reverts commit d8dfcd7.

Syndicate.pro

@@ -1,42 +1,23 @@
 TEMPLATE = app
-TARGET = Syndicate
-VERSION = 1.0.1.7
+TARGET = Syndicate-qt
+VERSION = 1.0.0.7
 INCLUDEPATH += src src/json src/qt src/qt/plugins/mrichtexteditor
-QT += network printsupport widgets sql
+QT += network printsupport
 DEFINES += ENABLE_WALLET
 DEFINES += BOOST_THREAD_USE_LIB BOOST_SPIRIT_THREADSAFE
 CONFIG += no_include_pwd
 CONFIG += thread
-CONFIG += static
 
 greaterThan(QT_MAJOR_VERSION, 4) {
-    QT += network printsupport widgets sql
+    QT += widgets webkitwidgets
     DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0
 }
 
 # for boost 1.37, add -mt to the boost libraries
 # use: qmake BOOST_LIB_SUFFIX=-mt
 # for boost thread win32 with _win32 sufix
 # use: BOOST_THREAD_LIB_SUFFIX=_win32-...
-# or when linking against a specific BerkelyDB version: BDB_LIB_SUFFIX=-4.8
-
-BOOST_LIB_SUFFIX=-mgw49-mt-s-1_57
-BOOST_INCLUDE_PATH=D:/deps/boost_1_57_0
-BOOST_LIB_PATH=D:/deps/boost_1_57_0/stage/lib
-BDB_INCLUDE_PATH=D:/deps/db-4.8.30.NC/build_unix
-BDB_LIB_PATH=D:/deps/db-4.8.30.NC/build_unix
-OPENSSL_INCLUDE_PATH=D:/deps/openssl-1.0.1p/include
-OPENSSL_LIB_PATH=D:/deps/openssl-1.0.1p/lib
-MINIUPNPC_INCLUDE_PATH=D:/deps/
-MINIUPNPC_LIB_PATH=D:/deps/miniupnpc
-QRENCODE_INCLUDE_PATH=D:/deps/qrencode-3.4.4
-QRENCODE_LIB_PATH=D:/deps/qrencode-3.4.4/.libs
-LIBEVENT_INCLUDE_PATH=D:/deps/libevent-2.0.21-stable/include
-LIBEVENT_LIB_PATH=D:/deps/libevent-2.0.21-stable/.libs
-SECP256K1_LIB_PATH = D:/deps/secp256k1/.libs
-SECP256K1_INCLUDE_PATH = D:/deps/secp256k1/include
-BOTAN_LIB_PATH = D:/deps/Botan-1.10.8/build/lib
-BOTAN_INCLUDE_PATH = D:/deps/Botan-1.10.8/build/include
+# or when linking against a specific BerkelyDB version: BDB_LIB_SUFFIX=-4.8	
 
 # 	 Dependency library locations can be customized with:
 #    BOOST_INCLUDE_PATH, BOOST_LIB_PATH, BDB_INCLUDE_PATH,
@@ -74,8 +55,7 @@ QMAKE_LFLAGS *= -fstack-protector-all --param ssp-buffer-size=1
 # for extra security (see: https://wiki.debian.org/Hardening): this flag is GCC compiler-specific
 QMAKE_CXXFLAGS *= -D_FORTIFY_SOURCE=2
 # for extra security on Windows: enable ASLR and DEP via GCC linker flags
-win32:QMAKE_LFLAGS *= -Wl,--dynamicbase -Wl,--nxcompat -Wl,--large-address-aware -static
-win32:QMAKE_LFLAGS *= -static-libgcc -static-libstdc++
+win32:QMAKE_LFLAGS *= -Wl,--dynamicbase -Wl,--nxcompat -Wl,--large-address-aware
 
 # use: qmake "USE_QRCODE=1"
 # libqrencode (http://fukuchi.org/works/qrencode/index.en.html) must be installed for support
@@ -105,7 +85,7 @@ contains(BITCOIN_NEED_QT_PLUGINS, 1) {
 #Build Leveldb
 INCLUDEPATH += src/leveldb/include src/leveldb/helpers
 LIBS += $$PWD/src/leveldb/libleveldb.a $$PWD/src/leveldb/libmemenv.a
-SOURCES += src/txdb-leveldb.cpp
+SOURCES += src/txdb-leveldb.cpp \
 
 !win32 {
     # we use QMAKE_CXXFLAGS_RELEASE even without RELEASE=1 because we use RELEASE to indicate linking preferences not -O preferences
@@ -116,7 +96,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
@@ -299,7 +279,7 @@ HEADERS += src/qt/bitcoingui.h \
     src/qt/addeditadrenalinenode.h \
     src/qt/adrenalinenodeconfigdialog.h \
     src/qt/qcustomplot.h \
-    src/qt/blockbrowser.h \
+    src/qt/blockexplorer.h \
     src/qt/messagepage.h \
     src/qt/messagemodel.h \
     src/qt/sendmessagesdialog.h \
@@ -318,14 +298,7 @@ HEADERS += src/qt/bitcoingui.h \
     src/sph_shavite.h \
     src/sph_simd.h \
     src/sph_types.h \
-    src/qt/editemployees.h \
-    src/qt/syndicate.h \
-    src/qt/employeemanager.h \
-    src/qt/loginportal.h \
-    src/qt/syndicatetools.h \
-    src/qt/myinventory.h \
-    src/qt/mybusiness.h \
-    src/qt/myfinancials.h
+
 
 SOURCES += src/qt/bitcoin.cpp src/qt/bitcoingui.cpp \
     src/qt/transactiontablemodel.cpp \
@@ -340,10 +313,7 @@ SOURCES += src/qt/bitcoin.cpp src/qt/bitcoingui.cpp \
     src/qt/editaddressdialog.cpp \
     src/qt/bitcoinaddressvalidator.cpp \
     src/alert.cpp \
-	src/qt/loginportal.cpp \
-	src/qt/syndicatetools.cpp \
     src/base58.cpp \
-	src/allocators.cpp \
     src/chainparams.cpp \
     src/version.cpp \
     src/sync.cpp \
@@ -352,9 +322,8 @@ SOURCES += src/qt/bitcoin.cpp src/qt/bitcoingui.cpp \
     src/hash.cpp \
     src/netbase.cpp \
     src/ecwrapper.cpp \
-	src/qt/syndicate.cpp \
+	src/allocators.cpp \
     src/key.cpp \
-	src/qt/editemployees.cpp \
     src/pubkey.cpp \
     src/script.cpp \
     src/scrypt.cpp \
@@ -388,9 +357,6 @@ SOURCES += src/qt/bitcoin.cpp src/qt/bitcoingui.cpp \
     src/rpcserver.cpp \
     src/rpcdump.cpp \
     src/rpcmisc.cpp \
-	src/qt/myinventory.cpp \
-    src/qt/mybusiness.cpp \
-    src/qt/myfinancials.cpp \
     src/rpcnet.cpp \
     src/rpcmining.cpp \
     src/rpcwallet.cpp \
@@ -444,8 +410,7 @@ SOURCES += src/qt/bitcoin.cpp src/qt/bitcoingui.cpp \
     src/qt/messagemodel.cpp \
     src/qt/sendmessagesdialog.cpp \
     src/qt/sendmessagesentry.cpp \
-	src/qt/employeemanager.cpp \
-    src/qt/blockbrowser.cpp \
+    src/qt/blockexplorer.cpp \
     src/qt/qvalidatedtextedit.cpp \
     src/qt/plugins/mrichtexteditor/mrichtextedit.cpp \
     src/rpcsmessage.cpp \
@@ -484,16 +449,8 @@ FORMS += \
     src/qt/forms/messagepage.ui \
     src/qt/forms/sendmessagesentry.ui \
     src/qt/forms/sendmessagesdialog.ui \
-    src/qt/forms/blockbrowser.ui \
-    src/qt/plugins/mrichtexteditor/mrichtextedit.ui \
-    src/qt/forms/editemployees.ui \
-    src/qt/forms/syndicate.ui \
-    src/qt/forms/employeemanager.ui \
-    src/qt/forms/loginportal.ui \
-    src/qt/forms/syndicatetools.ui \
-    src/qt/forms/myinventory.ui \
-    src/qt/forms/mybusiness.ui \
-    src/qt/forms/myfinancials.ui
+    src/qt/forms/blockexplorer.ui \
+    src/qt/plugins/mrichtexteditor/mrichtextedit.ui
 
 
 
@@ -630,18 +587,18 @@ macx:OBJECTIVE_SOURCES += src/qt/macdockiconhandler.mm src/qt/macnotificationhan
 macx:LIBS += -framework Foundation -framework ApplicationServices -framework AppKit -framework CoreServices
 macx:DEFINES += MAC_OSX MSG_NOSIGNAL=0
 macx:ICON = src/qt/res/icons/bitcoin.icns
-macx:TARGET = "Syndicate"
+macx:TARGET = "Syndicate-Qt"
 macx:QMAKE_CFLAGS_THREAD += -pthread
 macx:QMAKE_LFLAGS_THREAD += -pthread
 macx:QMAKE_CXXFLAGS_THREAD += -pthread
 macx:QMAKE_INFO_PLIST = share/qt/Info.plist
 
 # Set libraries and includes at end, to use platform-defined defaults if not overridden
-INCLUDEPATH += $$BOOST_INCLUDE_PATH $$BDB_INCLUDE_PATH $$OPENSSL_INCLUDE_PATH $$QRENCODE_INCLUDE_PATH $$BOTAN_INCLUDE_PATH
-LIBS += $$join(BOOST_LIB_PATH,,-L,) $$join(BDB_LIB_PATH,,-L,) $$join(OPENSSL_LIB_PATH,,-L,) $$join(QRENCODE_LIB_PATH,,-L,) $$join(BOTAN_LIB_PATH,, -L,)
+INCLUDEPATH += $$BOOST_INCLUDE_PATH $$BDB_INCLUDE_PATH $$OPENSSL_INCLUDE_PATH $$QRENCODE_INCLUDE_PATH
+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
 # -lgdi32 has to happen after -lcrypto (see  #681)
-windows:LIBS += -lws2_32 -lshlwapi -lmswsock -lole32 -loleaut32 -luuid -lgdi32 -lBotan
+windows:LIBS += -lws2_32 -lshlwapi -lmswsock -lole32 -loleaut32 -luuid -lgdi32
 !windows: {
     LIBS += -lgmp
 }

contrib/gitian-descriptors/gitian-osx.yml

@@ -76,13 +76,13 @@ script: |
   export INSTALLNAMETOOL=${HOST}-install_name_tool
   export STRIP=${HOST}-strip
   chmod +x contrib/macdeploy/macdeployqtplus
-  OTOOL=${HOST}-otool INSTALLNAMETOOL=${HOST}-install_name_tool STRIP=${HOST}-strip contrib/macdeploy/macdeployqtplus Syndicate.app
+  OTOOL=${HOST}-otool INSTALLNAMETOOL=${HOST}-install_name_tool STRIP=${HOST}-strip contrib/macdeploy/macdeployqtplus Syndicate-Qt.app
   mkdir -p  dist/.background
   install contrib/macdeploy/background.png dist/.background
   install contrib/macdeploy/DS_Store dist/.DS_Store
   cd dist
   ln -sf /Applications Applications
   cd ..
-  genisoimage -no-cache-inodes -l -probe -V "Syndicate" -no-pad -r -apple -o Shadow.tmp.dmg dist
-  dmg dmg Syndicate.tmp.dmg $OUTDIR/Syndicate.dmg
+  genisoimage -no-cache-inodes -l -probe -V "Syndicate-Qt" -no-pad -r -apple -o Shadow.tmp.dmg dist
+  dmg dmg Syndicate-Qt.tmp.dmg $OUTDIR/Syndicate.dmg
   #

contrib/macdeploy/fancy.plist

@@ -22,7 +22,7 @@
 			<integer>370</integer>
 			<integer>156</integer>
 		</array>
-		<key>Syndicate.app</key>
+		<key>Syndicate-Qt.app</key>
 		<array>
 			<integer>128</integer>
 			<integer>156</integer>

contrib/macdeploy/notes.txt

@@ -6,7 +6,7 @@ You will need the appscript package for the fancy disk image creation to work.
 Install it by invoking "sudo easy_install appscript".
 
 Ths script should be invoked in the target directory like this:
-$source_dir/contrib/macdeploy/macdeployqtplus Syndicate.app -add-qt-tr da,de,es,hu,ru,uk,zh_CN,zh_TW -dmg -fancy $source_dir/contrib/macdeploy/fancy.plist -verbose 2
+$source_dir/contrib/macdeploy/macdeployqtplus Syndicate-Qt.app -add-qt-tr da,de,es,hu,ru,uk,zh_CN,zh_TW -dmg -fancy $source_dir/contrib/macdeploy/fancy.plist -verbose 2
 
 During the process, the disk image window will pop up briefly where the fancy
 settings are applied. This is normal, please do not interfere.
@@ -19,8 +19,8 @@ Fill in the following.
 Enable custom process step: [x]
 Command: %{sourceDir}/contrib/macdeploy/macdeployqtplus
 Working directory: %{buildDir}
-Command arguments: Syndicate.app -add-qt-tr da,de,es,hu,ru,uk,zh_CN,zh_TW -dmg -fancy %{sourceDir}/contrib/macdeploy/fancy.plist -verbose 2
+Command arguments: Syndicate-Qt.app -add-qt-tr da,de,es,hu,ru,uk,zh_CN,zh_TW -dmg -fancy %{sourceDir}/contrib/macdeploy/fancy.plist -verbose 2
 
 After that you can start the deployment process through the menu with
-Build -> Deploy Project "Syndicate"
+Build -> Deploy Project "Syndicate-qt"
 

doc/build-unix.md

@@ -77,7 +77,7 @@ Optional:
 Dependencies for the GUI: Ubuntu & Debian
 -----------------------------------------
 
-If you want to build Syndicate, make sure that the required packages for Qt development
+If you want to build Syndicate-Qt, make sure that the required packages for Qt development
 are installed. Qt 5 is necessary to build the GUI.
 If both Qt 4 and Qt 5 are installed, Qt 5 will be used.
 
@@ -89,7 +89,7 @@ libqrencode (optional) can be installed with:
 
     sudo apt-get install libqrencode-dev
 
-Once these are installed, they will be found by configure and a Syndicate executable will be
+Once these are installed, they will be found by configure and a Syndicate-qt executable will be
 built by default.
 
 Berkeley DB
@@ -143,7 +143,7 @@ With UPNP:
     make -f makefile.unix USE_UPNP= && \
     strip Syndicated
 
-To Build Syndicate
+To Build Syndicate-QT
 --------
 
 With UPNP:

doc/readme-qt.rst

@@ -1,4 +1,4 @@
-Syndicate: Qt5 GUI for Syndicate
+Syndicate-qt: Qt5 GUI for Syndicate
 ===============================
 
 Linux

share/qt/Info.plist

@@ -7,13 +7,13 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleGetInfoString</key>
-	<string>Syndicate</string>
+	<string>Syndicate-Qt</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleExecutable</key>
-	<string>Syndicate</string>
+	<string>Syndicate-Qt</string>
 	<key>CFBundleIdentifier</key>
-	<string>co.Syndicate.Syndicate</string>
+	<string>co.Syndicate.Syndicate-Qt</string>
         <key>CFBundleURLTypes</key>
         <array>
           <dict>

src/chainparams.cpp

@@ -88,12 +88,12 @@ class CMainParams : public CChainParams {
         assert(genesis.hashMerkleRoot == uint256("0xffc835b4aab6d5002db95706cd864c5614dfb1d7cfda1ce3beedf740a9aca558"));
 
 
-        base58Prefixes[PUBKEY_ADDRESS] = std::vector<unsigned char>(1,63);
-        base58Prefixes[SCRIPT_ADDRESS] = std::vector<unsigned char>(1,85);
-        base58Prefixes[SECRET_KEY] =     std::vector<unsigned char>(1,153);
-        base58Prefixes[STEALTH_ADDRESS] = std::vector<unsigned char>(1,40);
-        base58Prefixes[EXT_PUBLIC_KEY] = list_of(0x04)(0x88)(0xB2)(0x1E).convert_to_container<std::vector<unsigned char> >();
-        base58Prefixes[EXT_SECRET_KEY] = list_of(0x04)(0x88)(0xAD)(0xE4).convert_to_container<std::vector<unsigned char> >();
+        base58Prefixes[PUBKEY_ADDRESS] = list_of(63);
+        base58Prefixes[SCRIPT_ADDRESS] = list_of(85);
+        base58Prefixes[SECRET_KEY] =     list_of(153);
+        base58Prefixes[STEALTH_ADDRESS] = list_of(40);
+        base58Prefixes[EXT_PUBLIC_KEY] = list_of(0x04)(0x88)(0xB2)(0x1E);
+        base58Prefixes[EXT_SECRET_KEY] = list_of(0x04)(0x88)(0xAD)(0xE4);
 
 
         vSeeds.push_back(CDNSSeedData("syndicatelabs.org", "dnsseed1.syndicatelabs.org"));
@@ -149,12 +149,12 @@ class CTestNetParams : public CMainParams {
         vFixedSeeds.clear();
         vSeeds.clear();
 
-        base58Prefixes[PUBKEY_ADDRESS] = std::vector<unsigned char>(1,97);
-        base58Prefixes[SCRIPT_ADDRESS] = std::vector<unsigned char>(1,196);
-        base58Prefixes[SECRET_KEY]     = std::vector<unsigned char>(1,239);
-        base58Prefixes[STEALTH_ADDRESS] = std::vector<unsigned char>(1,40);
-        base58Prefixes[EXT_PUBLIC_KEY] = list_of(0x04)(0x35)(0x87)(0xCF).convert_to_container<std::vector<unsigned char> >();
-        base58Prefixes[EXT_SECRET_KEY] = list_of(0x04)(0x35)(0x83)(0x94).convert_to_container<std::vector<unsigned char> >();
+        base58Prefixes[PUBKEY_ADDRESS] = list_of(97);
+        base58Prefixes[SCRIPT_ADDRESS] = list_of(196);
+        base58Prefixes[SECRET_KEY]     = list_of(239);
+        base58Prefixes[STEALTH_ADDRESS] = list_of(40);
+        base58Prefixes[EXT_PUBLIC_KEY] = list_of(0x04)(0x35)(0x87)(0xCF);
+        base58Prefixes[EXT_SECRET_KEY] = list_of(0x04)(0x35)(0x83)(0x94);
 
         convertSeeds(vFixedSeeds, pnTestnetSeed, ARRAYLEN(pnTestnetSeed), nDefaultPort);
 

src/chainparamsseeds.h

@@ -7,16 +7,7 @@
 // IPv4 as well as onion addresses are wrapped inside a IPv6 address accordingly.
 static const unsigned int pnSeed[] =
 {
-    0x7A2B3F2D, // Amsterdam
-    0xF59C202D, // Frankfurt
-    0xCEAE3D6C, // London
-    0x30343F2D, // Los Angeles
-    0xA56F3F2D, // Miami
-    0xBF85EE68, // New Jersey
-    0x0C94202D, // Paris
-    0x98E1202D, // Seattle
-    0xE81B3F2D, // Sydney
-    0x3197EE68, // Tokyo
+	0x602d448a
 };
 
 

src/clientversion.h

@@ -8,7 +8,7 @@
 // These need to be macros, as version.cpp's and bitcoin-qt.rc's voodoo requires it
 #define CLIENT_VERSION_MAJOR       1
 #define CLIENT_VERSION_MINOR       0
-#define CLIENT_VERSION_REVISION    1
+#define CLIENT_VERSION_REVISION    0
 #define CLIENT_VERSION_BUILD       7
 
 // Set to true for release, false for prerelease or test build