Skip to content
Permalink
Browse files

Mandatory Update to V1.0.2

  • Loading branch information...
xcompaydev
xcompaydev committed Mar 14, 2019
1 parent 73d21ca commit b95b6abb28552fe2a40b09bf7b2ef4e0aec30d22
Showing with 15 additions and 152 deletions.
  1. +1 −1 configure.ac
  2. +5 −4 src/chainparams.cpp
  3. +1 −1 src/clientversion.h
  4. +3 −141 src/main.cpp
  5. +1 −1 src/qt/guiutil.cpp
  6. +4 −4 src/version.h
@@ -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)
@@ -54,13 +54,14 @@ static void convertSeed6(std::vector<CAddress>& vSeedsOut, const SeedSpec6* data
// + Contains no strange transactions
static Checkpoints::MapCheckpoints mapCheckpoints =
boost::assign::map_list_of
(0, uint256("0x00000e0a9fa93f672bf13b70038973c63a2731f2576cb712de94cffd13a71f85"));
(0, uint256("0x00000e0a9fa93f672bf13b70038973c63a2731f2576cb712de94cffd13a71f85"))
(22760, uint256("a9a7cfda59ad6673df1b7ba7d77d45c1090cf932c9fc9c23e74db7b7a67423f7"));
static const Checkpoints::CCheckpointData data = {
&mapCheckpoints,
1551195000, // * UNIX timestamp of last checkpoint block
1, // * total number of transactions between genesis and last checkpoint
1552558870, // * UNIX timestamp of last checkpoint block
47665, // * total number of transactions between genesis and last checkpoint
// (the tx=... number in the SetBestChain debug.log lines)
500 // * estimated number of transactions per day after checkpoint
1500 // * estimated number of transactions per day after checkpoint
};

static Checkpoints::MapCheckpoints mapCheckpointsTestnet =
@@ -16,7 +16,7 @@
//! These need to be macros, as clientversion.cpp's and xcompay*-res.rc's voodoo requires it
#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

//! Set to true for release, false for prerelease or test build
@@ -85,7 +85,7 @@ bool fCheckBlockIndex = false;
unsigned int nCoinCacheSize = 5000;
bool fAlerts = DEFAULT_ALERTS;

unsigned int nStakeMinAge = 60 * 60;
unsigned int nStakeMinAge = 12 * 60 * 60;
int64_t nReserveBalance = 0;

/** Fees smaller than this (in uxcom) are considered zero fee (for relaying and mining)
@@ -1573,149 +1573,11 @@ int64_t GetBlockValue(int nHeight)
else if (nHeight < Params().LAST_POW_BLOCK()) {
nSubsidy = 250 * COIN;
}
else if (nHeight <= 29999 && nHeight >= Params().LAST_POW_BLOCK()) {
else if (nHeight <= 525600 && nHeight >= Params().LAST_POW_BLOCK()) {
nSubsidy = 1 * COIN;
}
else if (nHeight <= 39999 && nHeight >= 30000) {
nSubsidy = 2 * COIN;
}
else if (nHeight <= 49999 && nHeight >= 40000) {
nSubsidy = 3 * COIN;
}
else if (nHeight <= 59999 && nHeight >= 50000) {
nSubsidy = 4 * COIN;
}
else if (nHeight <= 69999 && nHeight >= 60000) {
nSubsidy = 5 * COIN;
}
else if (nHeight <= 79999 && nHeight >= 70000) {
nSubsidy = 6 * COIN;
}
else if (nHeight <= 89999 && nHeight >= 80000) {
nSubsidy = 6.5 * COIN;
}
else if (nHeight <= 99999 && nHeight >= 90000) {
nSubsidy = 7 * COIN;
}
else if (nHeight <= 109999 && nHeight >= 100000) {
nSubsidy = 7.5 * COIN;
}
else if (nHeight <= 119999 && nHeight >= 110000) {
nSubsidy = 8 * COIN;
}
else if (nHeight <= 129999 && nHeight >= 120000) {
nSubsidy = 8.5 * COIN;
}
else if (nHeight <= 139999 && nHeight >= 130000) {
nSubsidy = 9 * COIN;
}
else if (nHeight <= 149999 && nHeight >= 140000) {
nSubsidy = 9.5 * COIN;
}
else if (nHeight <= 159999 && nHeight >= 150000) {
nSubsidy = 10 * COIN;
}
else if (nHeight <= 169999 && nHeight >= 160000) {
nSubsidy = 10.5 * COIN;
}
else if (nHeight <= 179999 && nHeight >= 170000) {
nSubsidy = 11 * COIN;
}
else if (nHeight <= 189999 && nHeight >= 180000) {
nSubsidy = 11.5 * COIN;
}
else if (nHeight <= 199999 && nHeight >= 190000) {
nSubsidy = 12 * COIN;
}
else if (nHeight <= 209999 && nHeight >= 200000) {
nSubsidy = 11.5 * COIN;
}
else if (nHeight <= 219999 && nHeight >= 210000) {
nSubsidy = 11 * COIN;
}
else if (nHeight <= 229999 && nHeight >= 220000) {
nSubsidy = 10.5 * COIN;
}
else if (nHeight <= 239999 && nHeight >= 230000) {
nSubsidy = 10 * COIN;
}
else if (nHeight <= 249999 && nHeight >= 240000) {
nSubsidy = 9.5 * COIN;
}
else if (nHeight <= 259999 && nHeight >= 250000) {
nSubsidy = 9 * COIN;
}
else if (nHeight <= 269999 && nHeight >= 260000) {
nSubsidy = 8.5 * COIN;
}
else if (nHeight <= 279999 && nHeight >= 270000) {
nSubsidy = 8 * COIN;
}
else if (nHeight <= 289999 && nHeight >= 280000) {
nSubsidy = 7.5 * COIN;
}
else if (nHeight <= 299999 && nHeight >= 290000) {
nSubsidy = 7.4 * COIN;
}
else if (nHeight <= 309999 && nHeight >= 300000) {
nSubsidy = 7.3 * COIN;
}
else if (nHeight <= 319999 && nHeight >= 310000) {
nSubsidy = 7.2 * COIN;
}
else if (nHeight <= 329999 && nHeight >= 320000) {
nSubsidy = 7.1 * COIN;
}
else if (nHeight <= 339999 && nHeight >= 330000) {
nSubsidy = 7 * COIN;
}
else if (nHeight <= 349999 && nHeight >= 340000) {
nSubsidy = 6.9 * COIN;
}
else if (nHeight <= 359999 && nHeight >= 350000) {
nSubsidy = 6.8 * COIN;
}
else if (nHeight <= 369999 && nHeight >= 360000) {
nSubsidy = 6.7 * COIN;
}
else if (nHeight <= 379999 && nHeight >= 370000) {
nSubsidy = 6.6 * COIN;
}
else if (nHeight <= 389999 && nHeight >= 380000) {
nSubsidy = 6.5 * COIN;
}
else if (nHeight <= 399999 && nHeight >= 390000) {
nSubsidy = 6.4 * COIN;
}
else if (nHeight <= 409999 && nHeight >= 400000) {
nSubsidy = 6.3 * COIN;
}
else if (nHeight <= 419999 && nHeight >= 410000) {
nSubsidy = 6.2 * COIN;
}
else if (nHeight <= 429999 && nHeight >= 420000) {
nSubsidy = 6.1 * COIN;
}
else if (nHeight <= 439999 && nHeight >= 430000) {
nSubsidy = 6 * COIN;
}
else if (nHeight <= 449999 && nHeight >= 440000) {
nSubsidy = 5.9 * COIN;
}
else if (nHeight <= 459999 && nHeight >= 450000) {
nSubsidy = 5.8 * COIN;
}
else if (nHeight <= 469999 && nHeight >= 460000) {
nSubsidy = 5.7 * COIN;
}
else if (nHeight <= 479999 && nHeight >= 470000) {
nSubsidy = 5.6 * COIN;
}
else if (nHeight <= 489999 && nHeight >= 480000) {
nSubsidy = 5.5 * COIN;
}
else {
nSubsidy = 5 * COIN;
nSubsidy = 2 * COIN;
}

// Check if we reached the coin max supply.
@@ -104,7 +104,7 @@ void setupAddressWidget(QValidatedLineEdit* widget, QWidget* parent)
widget->setFont(bitcoinAddressFont());
// We don't want translators to use own addresses in translations
// and this is the only place, where this address is supplied.
widget->setPlaceholderText(QObject::tr("Enter a XCOM address (e.g. %1)").arg("D7VFR83SQbiezrW72hjcWJtcfip5krte2Z"));
widget->setPlaceholderText(QObject::tr("Enter a XCOM address (e.g. %1)").arg("XhrkBAuFi65v72PU3s4wxzUYjqnxnwVCtR"));
widget->setValidator(new BitcoinAddressEntryValidator(parent));
widget->setCheckValidator(new BitcoinAddressCheckValidator(parent));
}
@@ -13,7 +13,7 @@
* network protocol versioning
*/

static const int PROTOCOL_VERSION = 70914;
static const int PROTOCOL_VERSION = 70915;

//! initial proto version, to be increased after version/verack negotiation
static const int INIT_PROTO_VERSION = 209;
@@ -22,8 +22,8 @@ static const int INIT_PROTO_VERSION = 209;
static const int GETHEADERS_VERSION = 70077;

//! disconnect from peers older than this proto version
static const int MIN_PEER_PROTO_VERSION = 70814;
static const int MIN_PEER_PROTO_VERSION_AFTER_ENFORCEMENT = 70914;
static const int MIN_PEER_PROTO_VERSION = 70914;
static const int MIN_PEER_PROTO_VERSION_AFTER_ENFORCEMENT = 70915;

//! fork blocks
static const int SOFT_FORK_VERSION_120 = 260000;
@@ -42,6 +42,6 @@ static const int MEMPOOL_GD_VERSION = 60002;
static const int NO_BLOOM_VERSION = 70005;

//! Community proposal starts with this version
static const int COMMUNITY_PROPOSAL_VERSION = 70913;
static const int COMMUNITY_PROPOSAL_VERSION = 70915;

#endif // BITCOIN_VERSION_H

0 comments on commit b95b6ab

Please sign in to comment.
You can’t perform that action at this time.