diff --git a/configure.ac b/configure.ac index 69db07c..8e7ee8a 100644 --- a/configure.ac +++ b/configure.ac @@ -1,7 +1,7 @@ dnl require autoconf 2.60 (AS_ECHO/AS_ECHO_N) AC_PREREQ([2.60]) define(_CLIENT_VERSION_MAJOR, 3) -define(_CLIENT_VERSION_MINOR, 1) +define(_CLIENT_VERSION_MINOR, 2) define(_CLIENT_VERSION_REVISION, 0) define(_CLIENT_VERSION_BUILD, 0) define(_CLIENT_VERSION_IS_RELEASE, true) diff --git a/src/chainparams.cpp b/src/chainparams.cpp index 0adcaef..eca1d61 100644 --- a/src/chainparams.cpp +++ b/src/chainparams.cpp @@ -67,12 +67,12 @@ static Checkpoints::MapCheckpoints mapCheckpoints = (80008, uint256("0x92c7a8d01cda2f3dccd85feb192021526280fdb6977bccfd4526f082011538e1")) (80213, uint256("0xfe92c41cb3e872d492fdff7fe50d4db15699880ec01c67b5bee86150e5296619")) (175448, uint256("0x14ace011f7ee65123731ada687df4e2213015e6bd7833dec14ebc98d005e0c9b")) - (470001, uint256("0x14ace011f7ee65123731ada687df4e2213015e6bd7833dec14ebc98d005e0c9b")) + (470001, uint256("0xa643a253d04b02980f2eb25ac392b32043801119ab9cb8678b46f60f2bfe14dc")) ; static const Checkpoints::CCheckpointData data = { &mapCheckpoints, - 1585829879, // * UNIX timestamp of last checkpoint block - 361027, // * total number of transactions between genesis and last checkpoint + 1601382805, // * UNIX timestamp of last checkpoint block + 971677, // * total number of transactions between genesis and last checkpoint // (the tx=... number in the SetBestChain debug.log lines) 2000 // * estimated number of transactions per day after checkpoint }; @@ -161,7 +161,7 @@ class CMainParams : public CChainParams //DNS SEEDS vSeeds.push_back(CDNSSeedData("divinelife.club", "seeder1.divinelife.club")); - vSeeds.push_back(CDNSSeedData("divinelife.club", "seeder1.divinelife.club")); + vSeeds.push_back(CDNSSeedData("divinelife.club", "seeder2.divinelife.club")); base58Prefixes[PUBKEY_ADDRESS] = std::vector(1, 78); base58Prefixes[SCRIPT_ADDRESS] = std::vector(1, 100); diff --git a/src/qt/bitcoingui.cpp b/src/qt/bitcoingui.cpp index 38758ce..a176de6 100644 --- a/src/qt/bitcoingui.cpp +++ b/src/qt/bitcoingui.cpp @@ -90,7 +90,7 @@ BitcoinGUI::BitcoinGUI(const NetworkStyle* networkStyle, QWidget* parent) : QMai multisigSignAction(0), aboutAction(0), receiveCoinsAction(0), - governanceAction(0), + //governanceAction(0), optionsAction(0), toggleHideAction(0), encryptWalletAction(0), @@ -349,15 +349,15 @@ void BitcoinGUI::createActions(const NetworkStyle* networkStyle) connect(masternodeAction, SIGNAL(triggered()), this, SLOT(gotoMasternodePage())); } - governanceAction = new QAction(QIcon(":/icons/governance"), tr("&YTM Pool"), this); - governanceAction->setToolTip(governanceAction->statusTip()); - governanceAction->setCheckable(true); + //governanceAction = new QAction(QIcon(":/icons/governance"), tr("&YTM Pool"), this); + //governanceAction->setToolTip(governanceAction->statusTip()); + //governanceAction->setCheckable(true); #ifdef Q_OS_MAC - governanceAction->setShortcut(QKeySequence(Qt::CTRL + Qt::Key_7)); + //governanceAction->setShortcut(QKeySequence(Qt::CTRL + Qt::Key_7)); #else - governanceAction->setShortcut(QKeySequence(Qt::ALT + Qt::Key_7)); + //governanceAction->setShortcut(QKeySequence(Qt::ALT + Qt::Key_7)); #endif - tabGroup->addAction(governanceAction); + //tabGroup->addAction(governanceAction); // These showNormalIfMinimized are needed because Send Coins and Receive Coins // can be triggered from the tray menu, and need to show the GUI to be useful. @@ -369,7 +369,7 @@ void BitcoinGUI::createActions(const NetworkStyle* networkStyle) connect(receiveCoinsAction, SIGNAL(triggered()), this, SLOT(gotoReceiveCoinsPage())); connect(historyAction, SIGNAL(triggered()), this, SLOT(showNormalIfMinimized())); connect(historyAction, SIGNAL(triggered()), this, SLOT(gotoHistoryPage())); - connect(governanceAction, SIGNAL(triggered()), this, SLOT(gotoGovernancePage())); + //connect(governanceAction, SIGNAL(triggered()), this, SLOT(gotoGovernancePage())); #endif // ENABLE_WALLET quitAction = new QAction(QIcon(":/icons/quit"), tr("E&xit"), this); @@ -550,7 +550,7 @@ void BitcoinGUI::createToolBars() if (settings.value("fShowMasternodesTab").toBool()) { toolbar->addAction(masternodeAction); } - toolbar->addAction(governanceAction); + //toolbar->addAction(governanceAction); toolbar->setMovable(false); // remove unused icon in upper left corner toolbar->setOrientation(Qt::Vertical); toolbar->setIconSize(QSize(40,40)); @@ -792,8 +792,8 @@ void BitcoinGUI::gotoMasternodePage() void BitcoinGUI::gotoGovernancePage() { - governanceAction->setChecked(true); - if (walletFrame) walletFrame->gotoGovernancePage(); + //governanceAction->setChecked(true); + //if (walletFrame) walletFrame->gotoGovernancePage(); } void BitcoinGUI::gotoReceiveCoinsPage() diff --git a/src/version.h b/src/version.h index d821c64..6a6e836 100644 --- a/src/version.h +++ b/src/version.h @@ -15,20 +15,20 @@ * @SMARTINSIDER+DIVINELIFE */ -static const int PROTOCOL_VERSION = 70930; +static const int PROTOCOL_VERSION = 70933; //! initial proto version, to be increased after version/verack negotiation static const int INIT_PROTO_VERSION = 209; //! In this version, 'getheaders' was introduced. -static const int GETHEADERS_VERSION = 70930; +static const int GETHEADERS_VERSION = 70933; //! disconnect from peers older than this proto version -static const int MIN_PEER_PROTO_VERSION_BEFORE_ENFORCEMENT = 70930; -static const int MIN_PEER_PROTO_VERSION_AFTER_ENFORCEMENT = 70930; +static const int MIN_PEER_PROTO_VERSION_BEFORE_ENFORCEMENT = 70933; +static const int MIN_PEER_PROTO_VERSION_AFTER_ENFORCEMENT = 70933; //! masternodes older than this proto version use old strMessage format for mnannounce -static const int MIN_PEER_MNANNOUNCE = 70930; +static const int MIN_PEER_MNANNOUNCE = 70933; //! nTime field added to CAddress, starting with this version; //! if possible, avoid requesting addresses nodes older than this @@ -41,7 +41,7 @@ static const int BIP0031_VERSION = 60000; static const int MEMPOOL_GD_VERSION = 60002; //! "filter*" commands are disabled without NODE_BLOOM after and including this version -static const int NO_BLOOM_VERSION = 70930; +static const int NO_BLOOM_VERSION = 70933; #endif // BITCOIN_VERSION_H