From 7be5264427d674c5ffcb088ca1cc010f419f46b7 Mon Sep 17 00:00:00 2001 From: UfyCoin <48001606+UfyCoin@users.noreply.github.com> Date: Tue, 2 Apr 2019 22:36:26 +0800 Subject: [PATCH] v1.0.2 collateral update. block reward update --- README.md | 30 +++++++++++++++--------------- configure.ac | 2 +- share/genbuild.sh | 2 +- src/chainparams.cpp | 1 + src/main.cpp | 10 +++++----- src/main.h | 10 +++++----- 6 files changed, 28 insertions(+), 27 deletions(-) diff --git a/README.md b/README.md index 1f27836..89ee2cc 100644 --- a/README.md +++ b/README.md @@ -89,43 +89,43 @@ Explorer http://explorer.ufycoin.com 40001-65000 - 150 + 500 50 50 - 75 - 75 + 250 + 250 65001-100000 - 225 + 1000 50 50 - 112.5 - 112.5 + 500 + 500 100001-135000 - 330 + 2000 50 50 - 165 - 165 + 1000 + 1000 135001-170000 - 500 + 2500 50 50 - 250 - 250 + 1250 + 1250 170001-340000 - 750 + 2500 50 50 - 375 - 375 + 1250 + 1250 diff --git a/configure.ac b/configure.ac index 6f10f04..949e0c0 100644 --- a/configure.ac +++ b/configure.ac @@ -2,7 +2,7 @@ dnl require autoconf 2.60 (AS_ECHO/AS_ECHO_N) AC_PREREQ([2.60]) define(_CLIENT_VERSION_MAJOR, 1) define(_CLIENT_VERSION_MINOR, 0) -define(_CLIENT_VERSION_REVISION, 1) +define(_CLIENT_VERSION_REVISION, 2) define(_CLIENT_VERSION_BUILD, 0) define(_CLIENT_VERSION_IS_RELEASE, true) define(_COPYRIGHT_YEAR, 2019) diff --git a/share/genbuild.sh b/share/genbuild.sh index 05533a9..623e159 100644 --- a/share/genbuild.sh +++ b/share/genbuild.sh @@ -22,7 +22,7 @@ git_check_in_repo() { ! { git status --porcelain -uall --ignored "$@" 2>/dev/null || echo '??'; } | grep -q '?' } -DESC="1.0.1" +DESC="1.0.2" SUFFIX="" LAST_COMMIT_DATE="" if [ "${BITCOIN_GENBUILD_NO_GIT}" != "1" -a -e "$(which git 2>/dev/null)" -a "$(git rev-parse --is-inside-work-tree 2>/dev/null)" = "true" ] && git_check_in_repo share/genbuild.sh; then diff --git a/src/chainparams.cpp b/src/chainparams.cpp index 1cdd6ce..fceb1ea 100644 --- a/src/chainparams.cpp +++ b/src/chainparams.cpp @@ -63,6 +63,7 @@ static Checkpoints::MapCheckpoints mapCheckpoints = (18800, uint256("aeccc7b013a20d758a81168dc120133a4c5406d75dec78bd5da5677c2a696338")) (24560, uint256("136a29b9e2b772d2fd7116e0f56bbae0838e9ddc66506de8ec7d564d6fe8677f")) (29200, uint256("1f28d1d08829fd4c35f2a52305327bb35ed62969d000648e9ae271e931a552b3")) + (38000, uint256("8f5657d1024e8155900c34ea39036c952657335286fc436f8a250ba955566401")) ; static const Checkpoints::CCheckpointData data = { &mapCheckpoints, diff --git a/src/main.cpp b/src/main.cpp index 7b8eb24..373a95f 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -1894,15 +1894,15 @@ int64_t GetBlockValue(int nHeight) } else if (nHeight <= 40000 && nHeight > 25000) { nSubsidy = 100 * COIN; } else if (nHeight <= 65000 && nHeight > 40000) { - nSubsidy = 150 * COIN; + nSubsidy = 500 * COIN; } else if (nHeight <= 100000 && nHeight > 65000) { - nSubsidy = 225 * COIN; + nSubsidy = 1000 * COIN; } else if (nHeight <= 135000 && nHeight > 100000) { - nSubsidy = 330 * COIN; + nSubsidy = 2000 * COIN; } else if (nHeight <= 170000 && nHeight > 135000) { - nSubsidy = 500 * COIN; + nSubsidy = 2500 * COIN; } else if (nHeight <= 340000 && nHeight > 170000) { - nSubsidy = 750 * COIN; + nSubsidy = 2500 * COIN; } else { nSubsidy = 5 * COIN; } diff --git a/src/main.h b/src/main.h index 9dd8eb1..454a227 100644 --- a/src/main.h +++ b/src/main.h @@ -70,15 +70,15 @@ inline int64_t GetMstrNodCollateral(int nHeight){ } else if (nHeight <= 40000 && nHeight > 25000) { return 750; } else if (nHeight <= 65000 && nHeight > 40000) { - return 1000; + return 10000; } else if (nHeight <= 100000 && nHeight > 65000) { - return 1250; + return 20000; } else if (nHeight <= 135000 && nHeight > 100000) { - return 1500; + return 40000; } else if (nHeight <= 170000 && nHeight > 135000) { - return 1875; + return 50000; } else if (nHeight <= 340000 && nHeight > 170000) { - return 2350; + return 50000; } return 100; }