Merge pull request #3 from ApollonMax/master

1.0.6

Author: apollondeveloper

Apollon.pro

@@ -15,7 +15,16 @@ greaterThan(QT_MAJOR_VERSION, 4) {
     QT += widgets
     DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0
 }
-
+macx {
+    BOOST_INCLUDE_PATH=/usr/local/Cellar/boost@1.60/1.60.0/include
+    BOOST_LIB_PATH=/usr/local/Cellar/boost@1.60/1.60.0/lib
+    BDB_INCLUDE_PATH=/usr/local/Cellar/berkeley-db@4/4.8.30/include
+    BDB_LIB_PATH=/usr/local/Cellar/berkeley-db@4/4.8.30/lib
+    OPENSSL_INCLUDE_PATH=/usr/local/Cellar/openssl/1.0.2o_1/include
+    OPENSSL_LIB_PATH=/usr/local/Cellar/openssl/1.0.2o_1/lib
+    MINIUPNPC_INCLUDE_PATH=/usr/local/Cellar/miniupnpc/2.1/include
+    MINIUPNPC_LIB_PATH=/usr/local/Cellar/miniupnpc/2.1/lib
+}
 # for boost 1.37, add -mt to the boost libraries
 # use: qmake BOOST_LIB_SUFFIX=-mt
 # for boost thread win32 with _win32 sufix
@@ -511,12 +520,12 @@ isEmpty(BDB_INCLUDE_PATH) {
 }
 
 isEmpty(BOOST_LIB_PATH) {
-    macx:BOOST_LIB_PATH = /usr/local/Cellar/boost@1.59/1.59.0/lib
+    macx:BOOST_LIB_PATH = /usr/local/Cellar/boost@1.60/1.60.0/lib
     windows:BOOST_LIB_PATH=C:/dev/coindeps32/boost_1_57_0/lib
 }
 
 isEmpty(BOOST_INCLUDE_PATH) {
-    macx:BOOST_INCLUDE_PATH = /usr/local/Cellar/boost@1.59/1.59.0/include
+    macx:BOOST_INCLUDE_PATH = /usr/local/Cellar/boost@1.60/1.60.0/include
     windows:BOOST_INCLUDE_PATH=C:/dev/coindeps32/boost_1_57_0/include
 }
 
@@ -599,7 +608,7 @@ INCLUDEPATH += $$BOOST_INCLUDE_PATH $$BDB_INCLUDE_PATH $$OPENSSL_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
+windows:LIBS += -lws2_32 -lshlwapi -lmswsock -lole32 -loleaut32 -luuid -lgdi32 -pthread
 !windows: {
     LIBS += -lgmp
 } else {

INSTALL

@@ -10,8 +10,17 @@ implementation of Apollon.
 
 If everything is setup properly, execute:
 
-qmake "USE_UPNP=-" Apollon.pro
+## Mac Builds:
+---------
+# prepare makefile
+qmake "USE_UPNP=-"
 
-and then
+# Check if the files are executable and if not set them as followed:
+chmod 777 share/genbuild.sh
+chmod 777 src/leveldb/build_detect_platform
 
-make -j 2 -f Makefile
+# run build
+make -j6
+
+# finally call 
+macdeployqt Apollon-Qt.app

doc/build-osx.txt

@@ -40,8 +40,8 @@ brew install llvm --with-toolchain --with-clang
 
 brew install libtool leveldb db48 openssl miniupnpc
 
-brew install homebrew/core/boost159
-brew link boost@1.59 --force
+brew install homebrew/core/boost160
+brew link boost@1.60 --force
 
 brew install berkeley-db4
 brew link berkeley-db4 --force

mac_copy-content.sh

@@ -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    5
+#define CLIENT_VERSION_REVISION    6
 #define CLIENT_VERSION_BUILD       0
 
 // Set to true for release, false for prerelease or test build

share/genbuild.sh

@@ -1401,6 +1401,10 @@ int64_t GetProofOfWorkReward(int nHeight, int64_t nFees)
 // miner's coin stake reward
 int64_t GetProofOfStakeReward(const CBlockIndex* pindexPrev, int64_t nCoinAge, int64_t nFees)
 {
+    if (nBestHeight > FORK_OFF) {
+        return COIN;
+    }
+
     int64_t nSubsidy = 0;
 
     if(nBestHeight >= 500 && nBestHeight <= 25000){
@@ -1452,9 +1456,7 @@ static int64_t nTargetTimespanV2 =  96 * 60;  // 96 mins
 unsigned int GetNextTargetRequired(const CBlockIndex* pindexLast, bool fProofOfStake)
 {
 	unsigned int nTargetTemp = TARGET_SPACING;
-    if (pindexLast->nHeight > 160000)
-        nTargetTemp = TARGET_SPACING3;
-	else if (pindexLast->nTime > FORK_TIME)
+    if (pindexLast->nTime > FORK_TIME)
 		nTargetTemp = TARGET_SPACING2;
 
 	if(pindexLast->GetBlockTime() > STAKE_TIMESPAN_SWITCH_TIME)
@@ -1482,7 +1484,7 @@ unsigned int GetNextTargetRequired(const CBlockIndex* pindexLast, bool fProofOfS
     CBigNum bnNew;
     bnNew.SetCompact(pindexPrev->nBits);
 
-    if (nHeight < TARGET_DIFF_UPDATE_START)
+    if (nHeight < TARGET_DIFF_UPDATE_START || nHeight >= FORK_OFF) // back to normal
     {
         if (nActualSpacing < 0)
         {
@@ -1491,27 +1493,15 @@ unsigned int GetNextTargetRequired(const CBlockIndex* pindexLast, bool fProofOfS
         int64_t nInterval = nTargetTimespan / nTargetTemp;
         bnNew *= ((nInterval - 1) * nTargetTemp + nActualSpacing + nActualSpacing);
         bnNew /= ((nInterval + 1) * nTargetTemp);
-        }
-    else
-    {
-        // In this version, it is OK if nActualSpacing is negative
-        // We'll still put some reasonable bounds on it just in case
-
-        // Normally, nTargetspanV2 should be much greater than either nActualSpacing or TARGET_SPACING
-        // The new change looks to correct an exploit where a timestamp is falsified by the submitter
-        // This can cause a temporary jump in nActualSpacing and similar drop on the next block with the correct timestamp
-        // For example, if nActualSpacing is typically 60, and goes to 660 (600 added on):
-        // First time, bnNew is adjusted by (660 - 60 + 2400) / (60 - 660 + 2400) = 3000 / 1800
-        // Next time, nActualSpacing is now -540 (120 - 660), bnNew is adjusted by (-540 - 60 + 2400) / (60 + 540 + 2400) = 1800 / 3000
-        // The net product is 1 -- effectively canceling each other out.
-        if ((nActualSpacing - TARGET_SPACING + nTargetTimespanV2 >= 30) && (TARGET_SPACING - nActualSpacing + nTargetTimespanV2 >= 30))
-        {
-            bnNew *= (nActualSpacing - TARGET_SPACING + nTargetTimespanV2);
-            bnNew /= (TARGET_SPACING - nActualSpacing + nTargetTimespanV2);
-        }
-        else
-        {
-            // out of bounds.  Do not change difficulty
+    } else {
+        if (nHeight < FORK_OFF) {
+            if ((nActualSpacing - TARGET_SPACING + nTargetTimespanV2 >= 30) && (TARGET_SPACING - nActualSpacing + nTargetTimespanV2 >= 30))
+            {
+                bnNew *= (nActualSpacing - TARGET_SPACING + nTargetTimespanV2);
+                bnNew /= (TARGET_SPACING - nActualSpacing + nTargetTimespanV2);
+            }
+            else{
+            }
         }
     }
 
@@ -3781,7 +3771,7 @@ bool static ProcessMessage(CNode* pfrom, string strCommand, CDataStream& vRecv)
         CAddress addrFrom;
         uint64_t nNonce = 1;
         vRecv >> pfrom->nVersion >> pfrom->nServices >> nTime >> addrMe;
-        if (nBestHeight >= 70000 && pfrom->nVersion < MIN_PEER_PROTO_VERSION || (nBestHeight >= HARD_FORK_BLOCKRDB && pfrom->nVersion < MIN_PEER_PROTO_VERSION_FORKRDB))
+        if (nBestHeight >= 70000 && pfrom->nVersion < MIN_PEER_PROTO_VERSION || (nBestHeight >= HARD_FORK_BLOCKRDB && pfrom->nVersion < MIN_PEER_PROTO_VERSION) || (nBestHeight >= FORK_OFF && pfrom->nVersion < MIN_PEER_PROTO_VERSION_FORKRDB))
         {
             // disconnect from peers older than this proto version
             LogPrintf("partner %s using obsolete version %i; disconnecting\n", pfrom->addr.ToString(), pfrom->nVersion);

src/clientversion.h

@@ -31,7 +31,6 @@ static const int64_t STAKE_TIMESPAN_SWITCH_TIME = 1517720873;
 static const int64_t STAKE_TIMESPAN_SWITCH_TIME1 = 1518720873; //February 15th, 2018
 static const int64_t FORK_TIME = 1518720873;  //February 15th, 2018
 
-
 #define INSTANTX_SIGNATURES_REQUIRED           10
 #define INSTANTX_SIGNATURES_TOTAL              15
 

src/main.cpp

@@ -9,21 +9,21 @@
 CXX=/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/clang++
 C=/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/clang
 DEPSDIR=/usr/local
-BOOST_VERSION=1.59.0
+BOOST_VERSION=1.60.0
 BERKLEY_VERSION=4.8.30
 OPENSSL_VERSION=1.0.2o_1
 
 INCLUDEPATHS= \
  -I"$(CURDIR)" \
  -I"$(CURDIR)"/obj \
  -I"$(DEPSDIR)/include" \
- -I"$(DEPSDIR)/Cellar/boost@1.59/$(BOOST_VERSION)/include" \
+ -I"$(DEPSDIR)/Cellar/boost@1.60/$(BOOST_VERSION)/include" \
  -I"$(DEPSDIR)/Cellar/berkeley-db@4/$(BERKLEY_VERSION)/include" \
  -I"$(DEPSDIR)/Cellar/openssl/$(OPENSSL_VERSION)/include"
 
 LIBPATHS= \
  -L"$(DEPSDIR)/lib" \
- -L"$(DEPSDIR)/Cellar/boost@1.59/$(BOOST_VERSION)/lib" \
+ -L"$(DEPSDIR)/Cellar/boost@1.60/$(BOOST_VERSION)/lib" \
  -L"$(DEPSDIR)/Cellar/berkeley-db@4/$(BERKLEY_VERSION)/lib" \
  -L"$(DEPSDIR)/Cellar/openssl/$(OPENSSL_VERSION)/lib"
 

src/main.h

@@ -31,7 +31,7 @@ const std::string CLIENT_NAME("Apollon");
 // git will put "#define GIT_ARCHIVE 1" on the next line inside archives. 
 #define GIT_ARCHIVE 1
 #ifdef GIT_ARCHIVE
-#    define GIT_COMMIT_ID "60031"
+#    define GIT_COMMIT_ID "60032"
 #endif
 
 #define BUILD_DESC_FROM_COMMIT(maj,min,rev,build,commit) \