sativacoin change logo and up proto

sativacoin change logo and up proto old proto work not rejected
NewSativacoinDev · Mar 13, 2015 · 2e9e29b · 2e9e29b
1 parent d5b3160
commit 2e9e29b
Show file tree

Hide file tree

Showing 97 changed files with 48 additions and 25 deletions.
diff --git a/README.md b/README.md
@@ -1,2 +1,4 @@
 sativacoin
 ==========
+before build need to add flag to build_detect_platform
+example: chmod 777 src\leveldb\build_detect_platform
diff --git a/sativacoin-qt.pro b/sativacoin-qt.pro
@@ -2,32 +2,39 @@ TEMPLATE = app
 TARGET = sativacoin-Qt
 VERSION = 1.0.1337
 INCLUDEPATH += src src/json src/qt src/qt/plugins/mrichtexteditor
-DEFINES += QT_GUI BOOST_THREAD_USE_LIB BOOST_SPIRIT_THREADSAFE
+QT += core gui network printsupport
+DEFINES += QT_GUI BOOST_THREAD_USE_LIB BOOST_SPIRIT_THREADSAFE USE_IPV6 BOOST_SPIRIT_THREADSAFE BOOST_THREAD_PROVIDES_GENERIC_SHARED_MUTEX_ON_WIN __NO_SYSTEM_INCLUDES
+DEFINES += STATIC
+DEFINES += QT_STATIC_BUILD
 CONFIG += no_include_pwd
 CONFIG += thread
 CONFIG += static
-QT += core gui network widgets
-greaterThan(QT_MAJOR_VERSION, 4): QT += widgets
-lessThan(QT_MAJOR_VERSION, 5): CONFIG += static
 QMAKE_CXXFLAGS = -fpermissive
-
 greaterThan(QT_MAJOR_VERSION, 4) {
     QT += widgets
     DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0
 }
+
 win32 {
-    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.1h/include
-    OPENSSL_LIB_PATH=C:/deps/openssl-1.0.1h
-    MINIUPNPC_INCLUDE_PATH=C:/deps/
-    MINIUPNPC_LIB_PATH=C:/deps/miniupnpc
-	QRENCODE_INCLUDE_PATH=C:/deps/qrencode-3.4.3
-    QRENCODE_LIB_PATH=C:/deps/qrencode-3.4.3/.libs
-}
+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
+windows:LIBS += -lws2_32 -lole32 -loleaut32 -luuid -lgdi32
+LIBS += -lboost_system-mgw49-mt-s-1_57 -lboost_filesystem-mgw49-mt-s-1_57 -lboost_program_options-mgw49-mt-s-1_57 -lboost_thread-mgw49-mt-s-1_57
+BOOST_LIB_SUFFIX=-mgw49-mt-s-1_57
+BOOST_INCLUDE_PATH=C:/deps/boost_1_57_0
+BOOST_LIB_PATH=C:/deps/boost_1_57_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.1l/include
+OPENSSL_LIB_PATH=C:/deps/openssl-1.0.1l
+MINIUPNPC_INCLUDE_PATH=C:/deps/
+MINIUPNPC_LIB_PATH=C:/deps/miniupnpc
+LIBPNG_INCLUDE_PATH=d:/deps/libpng-1.6.16
+LIBPNG_LIB_PATH=d:/deps/libpng-1.6.16/.libs
+QRENCODE_INCLUDE_PATH=C:/deps/qrencode-3.4.4
+QRENCODE_LIB_PATH=C:/deps/qrencode-3.4.4/.libs
+} 
 
 
 
@@ -64,7 +71,8 @@ QMAKE_LFLAGS *= -fstack-protector-all --param ssp-buffer-size=1
 # We need to exclude this for Windows cross compile with MinGW 4.2.x, as it will result in a non-working executable!
 # 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 win32: enable GCC large address aware linker flag
 win32:QMAKE_LFLAGS *= -Wl,--large-address-aware -static
 win32:QMAKE_LFLAGS += -static-libgcc -static-libstdc++
 lessThan(QT_MAJOR_VERSION, 5): win32: QMAKE_LFLAGS *= -static
@@ -93,6 +101,7 @@ contains(USE_UPNP, -) {
     DEFINES += USE_UPNP=$$USE_UPNP STATICLIB
     INCLUDEPATH += $$MINIUPNPC_INCLUDE_PATH
     LIBS += $$join(MINIUPNPC_LIB_PATH,,-L,) -lminiupnpc
+	win32:LIBS += -liphlpapi
 }
 
 # use: qmake "USE_DBUS=1" or qmake "USE_DBUS=0"
@@ -440,7 +449,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 = -mgw48-mt-s-1_550
+    windows:BOOST_LIB_SUFFIX = -mgw49-mt-s-1_57
 }
 
 isEmpty(BOOST_THREAD_LIB_SUFFIX) {

diff --git a/src/checkpoints.cpp b/src/checkpoints.cpp
@@ -25,6 +25,10 @@ namespace Checkpoints
     static MapCheckpoints mapCheckpoints =
         boost::assign::map_list_of
         ( 0,      hashGenesisBlock )
+		( 7200, uint256("0x00000000116d4b70d0607dd2170ff8b49021a60dd2d414bb5e0a0d52f3df9396"))
+		( 7201, uint256("0x0ec62de445763e573e0880d1ab46d2890d138f7f9112f0b7be6d247da7b34e98"))
+		( 8701, uint256("0xce2ee9a3b6d7ee27aa35351dc52044929e5655b3d417f41863336a8117bd0537"))
+		( 30701, uint256("0x3bfd98e3f924b14a714d32e7a00e04bab1fb8a3106fc6f83495f79d009d02741"))
     ;
 
     // TestNet has no checkpoints

diff --git a/src/clientversion.h b/src/clientversion.h
@@ -7,9 +7,9 @@
 
 // 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_MINOR       1
 #define CLIENT_VERSION_REVISION    0
-#define CLIENT_VERSION_BUILD       1337
+#define CLIENT_VERSION_BUILD       0
 
 // Converts the parameter X to a string after macro replacement on X has been performed.
 // Don't merge these into one macro!

diff --git a/src/kernel.cpp b/src/kernel.cpp
@@ -18,6 +18,9 @@ typedef std::map<int, unsigned int> MapModifierCheckpoints;
 static std::map<int, unsigned int> mapStakeModifierCheckpoints =
     boost::assign::map_list_of
         ( 0, 0x00000000fd11f4e7 )
+		( 7201, 0x05f76b68 )
+		( 8701, 0xcd9af1ff )
+		( 30701, 0xe9042faa )
     ;
 
 // Hard checkpoints of stake modifiers to ensure they are deterministic (testNet)

diff --git a/src/net.cpp b/src/net.cpp
@@ -1289,7 +1289,12 @@ void MapPort()
 // The second name should resolve to a list of seed addresses.
 
 static const char *strDNSSeed[][2] = {
-    {"176.31.30.93", "176.31.30.93"} //Main sativacoin Seed Node
+	{"5.196.226.54", "5.196.226.54"},
+	{"192.99.111.227", "192.99.111.227"},
+	{"198.50.151.86", "198.50.151.86"},
+	{"5.196.29.188", "5.196.29.188"},
+    {"176.31.30.93", "176.31.30.93"}
+//	{NULL, NULL}
 };
 
 void ThreadDNSAddressSeed(void* parg)

diff --git a/src/qt/locale/bitcoin_af_ZA.qm b/src/qt/locale/bitcoin_af_ZA.qm
diff --git a/src/qt/locale/bitcoin_ar.qm b/src/qt/locale/bitcoin_ar.qm
diff --git a/src/qt/locale/bitcoin_be_BY.qm b/src/qt/locale/bitcoin_be_BY.qm
diff --git a/src/qt/locale/bitcoin_bg.qm b/src/qt/locale/bitcoin_bg.qm
diff --git a/src/qt/locale/bitcoin_bs.qm b/src/qt/locale/bitcoin_bs.qm
diff --git a/src/qt/locale/bitcoin_ca.qm b/src/qt/locale/bitcoin_ca.qm
diff --git a/src/qt/locale/bitcoin_ca@valencia.qm b/src/qt/locale/bitcoin_ca@valencia.qm
diff --git a/src/qt/locale/bitcoin_ca_ES.qm b/src/qt/locale/bitcoin_ca_ES.qm
diff --git a/src/qt/locale/bitcoin_cs.qm b/src/qt/locale/bitcoin_cs.qm
diff --git a/src/qt/locale/bitcoin_cy.qm b/src/qt/locale/bitcoin_cy.qm
diff --git a/src/qt/locale/bitcoin_da.qm b/src/qt/locale/bitcoin_da.qm
diff --git a/src/qt/locale/bitcoin_de.qm b/src/qt/locale/bitcoin_de.qm
diff --git a/src/qt/locale/bitcoin_el_GR.qm b/src/qt/locale/bitcoin_el_GR.qm
diff --git a/src/qt/locale/bitcoin_en.qm b/src/qt/locale/bitcoin_en.qm
diff --git a/src/qt/locale/bitcoin_eo.qm b/src/qt/locale/bitcoin_eo.qm
diff --git a/src/qt/locale/bitcoin_es.qm b/src/qt/locale/bitcoin_es.qm
diff --git a/src/qt/locale/bitcoin_es_CL.qm b/src/qt/locale/bitcoin_es_CL.qm
diff --git a/src/qt/locale/bitcoin_es_DO.qm b/src/qt/locale/bitcoin_es_DO.qm
diff --git a/src/qt/locale/bitcoin_es_MX.qm b/src/qt/locale/bitcoin_es_MX.qm
diff --git a/src/qt/locale/bitcoin_es_UY.qm b/src/qt/locale/bitcoin_es_UY.qm
diff --git a/src/qt/locale/bitcoin_et.qm b/src/qt/locale/bitcoin_et.qm
diff --git a/src/qt/locale/bitcoin_eu_ES.qm b/src/qt/locale/bitcoin_eu_ES.qm
diff --git a/src/qt/locale/bitcoin_fa.qm b/src/qt/locale/bitcoin_fa.qm
diff --git a/src/qt/locale/bitcoin_fa_IR.qm b/src/qt/locale/bitcoin_fa_IR.qm
diff --git a/src/qt/locale/bitcoin_fi.qm b/src/qt/locale/bitcoin_fi.qm
diff --git a/src/qt/locale/bitcoin_fr.qm b/src/qt/locale/bitcoin_fr.qm
diff --git a/src/qt/locale/bitcoin_fr_CA.qm b/src/qt/locale/bitcoin_fr_CA.qm
diff --git a/src/qt/locale/bitcoin_gl.qm b/src/qt/locale/bitcoin_gl.qm
diff --git a/src/qt/locale/bitcoin_he.qm b/src/qt/locale/bitcoin_he.qm
diff --git a/src/qt/locale/bitcoin_hi_IN.qm b/src/qt/locale/bitcoin_hi_IN.qm
diff --git a/src/qt/locale/bitcoin_hr.qm b/src/qt/locale/bitcoin_hr.qm
diff --git a/src/qt/locale/bitcoin_hu.qm b/src/qt/locale/bitcoin_hu.qm
diff --git a/src/qt/locale/bitcoin_id_ID.qm b/src/qt/locale/bitcoin_id_ID.qm
diff --git a/src/qt/locale/bitcoin_it.qm b/src/qt/locale/bitcoin_it.qm
diff --git a/src/qt/locale/bitcoin_ja.qm b/src/qt/locale/bitcoin_ja.qm
diff --git a/src/qt/locale/bitcoin_ka.qm b/src/qt/locale/bitcoin_ka.qm
diff --git a/src/qt/locale/bitcoin_kk_KZ.qm b/src/qt/locale/bitcoin_kk_KZ.qm
diff --git a/src/qt/locale/bitcoin_ko_KR.qm b/src/qt/locale/bitcoin_ko_KR.qm
diff --git a/src/qt/locale/bitcoin_ky.qm b/src/qt/locale/bitcoin_ky.qm
diff --git a/src/qt/locale/bitcoin_la.qm b/src/qt/locale/bitcoin_la.qm
diff --git a/src/qt/locale/bitcoin_lt.qm b/src/qt/locale/bitcoin_lt.qm
diff --git a/src/qt/locale/bitcoin_lv_LV.qm b/src/qt/locale/bitcoin_lv_LV.qm
diff --git a/src/qt/locale/bitcoin_ms_MY.qm b/src/qt/locale/bitcoin_ms_MY.qm
diff --git a/src/qt/locale/bitcoin_nb.qm b/src/qt/locale/bitcoin_nb.qm
diff --git a/src/qt/locale/bitcoin_nl.qm b/src/qt/locale/bitcoin_nl.qm
diff --git a/src/qt/locale/bitcoin_pam.qm b/src/qt/locale/bitcoin_pam.qm
diff --git a/src/qt/locale/bitcoin_pl.qm b/src/qt/locale/bitcoin_pl.qm
diff --git a/src/qt/locale/bitcoin_pt_BR.qm b/src/qt/locale/bitcoin_pt_BR.qm
diff --git a/src/qt/locale/bitcoin_pt_PT.qm b/src/qt/locale/bitcoin_pt_PT.qm
diff --git a/src/qt/locale/bitcoin_ro_RO.qm b/src/qt/locale/bitcoin_ro_RO.qm
diff --git a/src/qt/locale/bitcoin_ru.qm b/src/qt/locale/bitcoin_ru.qm
diff --git a/src/qt/locale/bitcoin_sah.qm b/src/qt/locale/bitcoin_sah.qm
diff --git a/src/qt/locale/bitcoin_sk.qm b/src/qt/locale/bitcoin_sk.qm
diff --git a/src/qt/locale/bitcoin_sl_SI.qm b/src/qt/locale/bitcoin_sl_SI.qm
diff --git a/src/qt/locale/bitcoin_sq.qm b/src/qt/locale/bitcoin_sq.qm
diff --git a/src/qt/locale/bitcoin_sr.qm b/src/qt/locale/bitcoin_sr.qm
diff --git a/src/qt/locale/bitcoin_sv.qm b/src/qt/locale/bitcoin_sv.qm
diff --git a/src/qt/locale/bitcoin_th_TH.qm b/src/qt/locale/bitcoin_th_TH.qm
diff --git a/src/qt/locale/bitcoin_tr.qm b/src/qt/locale/bitcoin_tr.qm
diff --git a/src/qt/locale/bitcoin_uk.qm b/src/qt/locale/bitcoin_uk.qm
diff --git a/src/qt/locale/bitcoin_ur_PK.qm b/src/qt/locale/bitcoin_ur_PK.qm
diff --git a/src/qt/locale/bitcoin_vi.qm b/src/qt/locale/bitcoin_vi.qm
diff --git a/src/qt/locale/bitcoin_vi_VN.qm b/src/qt/locale/bitcoin_vi_VN.qm
diff --git a/src/qt/locale/bitcoin_zh_CN.qm b/src/qt/locale/bitcoin_zh_CN.qm
diff --git a/src/qt/locale/bitcoin_zh_TW.qm b/src/qt/locale/bitcoin_zh_TW.qm
diff --git a/src/qt/res/icons/STV-Accepted--420x160.png b/src/qt/res/icons/STV-Accepted--420x160.png
diff --git a/src/qt/res/icons/STV-Accepted-118x45.png b/src/qt/res/icons/STV-Accepted-118x45.png
diff --git a/src/qt/res/icons/STV-Accepted-202x77.png b/src/qt/res/icons/STV-Accepted-202x77.png
diff --git a/src/qt/res/icons/STV-Accepted-840x321.png b/src/qt/res/icons/STV-Accepted-840x321.png
diff --git a/src/qt/res/icons/STV-Accepted-Full.png b/src/qt/res/icons/STV-Accepted-Full.png
diff --git a/src/qt/res/icons/STV-Accepted-Small.png b/src/qt/res/icons/STV-Accepted-Small.png
diff --git a/src/qt/res/icons/STV-Accepted-X-Small.png b/src/qt/res/icons/STV-Accepted-X-Small.png
diff --git a/src/qt/res/icons/STV-Coin-256.png b/src/qt/res/icons/STV-Coin-256.png
diff --git a/src/qt/res/icons/STV-Coin-64.png b/src/qt/res/icons/STV-Coin-64.png
diff --git a/src/qt/res/icons/STV-Coin-Black-256.png b/src/qt/res/icons/STV-Coin-Black-256.png
diff --git a/src/qt/res/icons/STV-Coin-Black-64.png b/src/qt/res/icons/STV-Coin-Black-64.png
diff --git a/src/qt/res/icons/STV-Coin-Black-Full.png b/src/qt/res/icons/STV-Coin-Black-Full.png
diff --git a/src/qt/res/icons/STV-Coin-Full.png b/src/qt/res/icons/STV-Coin-Full.png
diff --git a/src/qt/res/icons/STV-Icon.ico b/src/qt/res/icons/STV-Icon.ico
diff --git a/src/qt/res/icons/SativaCoin-Black-Accepted.png b/src/qt/res/icons/SativaCoin-Black-Accepted.png
diff --git a/src/qt/res/icons/bitcoin.icns b/src/qt/res/icons/bitcoin.icns
diff --git a/src/qt/res/icons/sativa.png b/src/qt/res/icons/sativa.png
diff --git a/src/qt/res/icons/sativacoin.icns b/src/qt/res/icons/sativacoin.icns
diff --git a/src/qt/res/icons/sativacoin.ico b/src/qt/res/icons/sativacoin.ico
diff --git a/src/qt/res/icons/sativacoin.png b/src/qt/res/icons/sativacoin.png
diff --git a/src/qt/res/icons/sativacoin256.png b/src/qt/res/icons/sativacoin256.png
diff --git a/src/qt/res/icons/sativacoin_testnet.png b/src/qt/res/icons/sativacoin_testnet.png
diff --git a/src/qt/res/icons/stv blue 256x256.png b/src/qt/res/icons/stv blue 256x256.png
diff --git a/src/qt/res/images/about.png b/src/qt/res/images/about.png
diff --git a/src/qt/res/images/splash.png b/src/qt/res/images/splash.png
diff --git a/src/version.h b/src/version.h
@@ -30,10 +30,10 @@ static const int DATABASE_VERSION = 100050;
 // network protocol versioning
 //
 
-static const int PROTOCOL_VERSION = 100050;
+static const int PROTOCOL_VERSION = 100051;
 
 // intial proto version, to be increased after version/verack negotiation
-static const int INIT_PROTO_VERSION = 209;
+static const int INIT_PROTO_VERSION = 210;
 
 // disconnect from peers older than this proto version
 static const int MIN_PEER_PROTO_VERSION = 209;
@@ -44,7 +44,7 @@ static const int CADDR_TIME_VERSION = 31402;
 
 // only request blocks from nodes outside this range of versions
 static const int NOBLKS_VERSION_START = 100002;
-static const int NOBLKS_VERSION_END = 100006;
+static const int NOBLKS_VERSION_END = 100049;
 
 // BIP 0031, pong message, is enabled for all versions AFTER this one
 static const int BIP0031_VERSION = 100000;