Merge branch '0.9.8.x' of https://github.com/LIMXTEC/BitCore into 0.9.8.x

Author: limxdev

README.md

@@ -1,35 +1,43 @@
-BitCore integration/staging tree
+Welcome to BitCore BTX
 =====================================
 
-[![Build Status](https://travis-ci.org/LIMXTEC/BitCore.svg?branch=0.15)](https://travis-ci.org/LIMXTEC/BitCore)
+![GitHub Logo](https://i.imgur.com/jnpy4Me.jpg)
 
-https://bitcore.cc
+[ Release Notes ](https://www.reddit.com/r/bitcore_btx/comments/fsbzog/odarhom_release_notes_short_overview_first_draft/) - [ FAQ ](https://www.reddit.com/r/bitcore_btx/wiki/index/odarhom_faq) - [ Website ](https://www.bitcore.cc) - [ BitcoinTalk ](https://bitcointalk.org/index.php?topic=1883902.0)
+
+[![Build Status](https://travis-ci.org/LIMXTEC/BitCore.svg?branch=0.9.8.x)](https://travis-ci.org/LIMXTEC/BitCore)
 
 What is BitCore?
 ----------------
 
-BitCore is an experimental digital currency that enables instant payments to
-anyone, anywhere in the world. BitCore uses peer-to-peer technology to operate
-with no central authority: managing transactions and issuing money are carried
-out collectively by the network. BitCore is also the name of open source
-software which enables the use of this currency.
+Established on 24th of April 2017, BitCore from the community for the community. BitCore has one of the lowest transaction fees on the market while possibly providing the best on-chain scaling solution in the  entire crypto-sphere. Take a look at our [comparison chart](https://bitcore.cc/wp-content/uploads/2019/11/BitCoreVsAgosto2019.jpg).
+
+BitCore BTX preserves and implements Bitcoin features such as SegWit, which enables advanced scaling technologies like Lightning Network. Significant differences at launch time included:
+
+- Unique wallet addresses (prefixes of 2 and S and btx (BIP 173 bench32)
+- Command Fork System
+- Masternode System Dash Core
+- 220 Byte Datacarriersize (OP_RETURN)
+- Hashalgorythm Timetravel10
+- Bitcore Diffshield
+- Travis CI support
 
 For more information, as well as an immediately useable, binary version of
 the BitCore software, see [https://bitcore.cc](https://bitcore.cc).
 
-License
--------
+Claiming for Bitcoin holders
+---
+
+Claiming for the first snapshot (Bitcoin block #463604) ended 30th of October 2017. We made a new snapshot of the Bitcoin network on 2nd of November 2017 (Bitcoin block #492820). These ~5 million addresses are able to claim BitCore BTX for free, right now! Read how to [here](https://steemit.com/crypto-news/@xwerk/bitcore-btx-guide-the-2nd-snapshot-for-btc-hodlers-free-btx-or-how-it-works).
 
-BitCore is released under the terms of the MIT license. See [COPYING](COPYING) for more
-information or see https://opensource.org/licenses/MIT.
 
 
 
 Development Process
 -------------------
 
 The `master` branch is regularly built and tested, but is not guaranteed to be
-completely stable. [Tags](https://github.com/LIMXTEC/bitcore/tags) are created
+completely stable. [Releases](https://github.com/LIMXTEC/bitcore/release) are created
 regularly to indicate new official, stable release versions of BitCore.
 
 The contribution workflow is described in [CONTRIBUTING.md](CONTRIBUTING.md).
@@ -38,8 +46,6 @@ The developer [mailing list](https://groups.google.com/forum/#!forum/bitcore-dev
 should be used to discuss complicated or controversial changes before working
 on a patch set.
 
-Developer IRC can be found on Freenode at #bitcore-dev.
-
 Testing
 -------
 
@@ -61,21 +67,11 @@ These tests can be run (if the [test dependencies](/test) are installed) with: `
 
 The Travis CI system makes sure that every pull request is built for Windows, Linux, and OS X, and that unit/sanity tests are run automatically.
 
-### Manual Quality Assurance (QA) Testing
-
-Changes should be tested by somebody other than the developer who wrote the
-code. This is especially important for large or high-risk changes. It is useful
-to add a test plan to the pull request description if testing the changes is
-not straightforward.
-
-Translations
-------------
-
-We only accept translation fixes that are submitted through [Bitcoin Core's Transifex page](https://www.transifex.com/projects/p/bitcore/).
-Translations are converted to BitCore periodically.
+License
+-------
 
-Translations are periodically pulled from Transifex and merged into the git repository. See the
-[translation process](doc/translation_process.md) for details on how this works.
+BitCore is released under the terms of the MIT license. See [COPYING](COPYING) for more
+information or see https://opensource.org/licenses/MIT.
 
 **Important**: We do not accept translation changes as GitHub pull requests because the next
 pull from Transifex would automatically overwrite them again.

configure.ac

@@ -1,9 +1,9 @@
 dnl require autoconf 2.60 (AS_ECHO/AS_ECHO_N)
 AC_PREREQ([2.60])
 define(_CLIENT_VERSION_MAJOR, 0)
-define(_CLIENT_VERSION_MINOR, 9)
+define(_CLIENT_VERSION_MINOR, 90)
 define(_CLIENT_VERSION_REVISION, 8)
-define(_CLIENT_VERSION_BUILD, 6)
+define(_CLIENT_VERSION_BUILD, 7)
 define(_CLIENT_VERSION_IS_RELEASE, true)
 define(_COPYRIGHT_YEAR, 2020)
 define(_COPYRIGHT_HOLDERS,[The %s developers])

masternode.sh

@@ -27,8 +27,8 @@ daemon="bitcored"
 cli_dir="/usr/local/bin"
 cli="bitcore-cli"
 ssh_port=${SSH_CLIENT##* }
-port=9468
-rpcport=9469
+port=8555
+rpcport=8556
 tport=19468
 trpcport=19469
 user="$name"

src/masternodeconfig.cpp

@@ -31,19 +31,23 @@ bool CMasternodeConfig::read(std::string& strErr) {
     if (!streamConfig2.good()) {
         FILE* configFile = fopen(pathConfigFile.string().c_str(), "a");
         if (configFile != NULL) {
-                        std::string strHeader = "# Bitcore config file v 1.0\n"
+                        std::string strHeader = "# BitCore Config File v. 1.0.1\n"
                         "# Network Nodes\n"
                         "addnode=seed.bitcore.biz\n"
                         "addnode=37.120.190.76\n"
                         "addnode=37.120.186.85\n"
                         "addnode=188.68.39.1\n"
                         "addnode=85.235.64.57\n"
-                        "# Masternode preparation (optional) - Note - You have to remove #\n"
+                        "addnode=46.38.243.55\n"
+                        "addnode=87.178.216.36\n"
+                        "addnode=93.192.188.220\n"
+                        "addnode=185.194.142.125\n"
+                        "# Optional: Masternode preparation (Note: Remove the # to make the Options useable)#\n"
                         "#masternodeaddr=1.2.3.4:8555\n"
                         "#externalip=1.2.3.4:8555\n"
                         "#masternode=1\n"
                         "#masternodeprivkey=yourkey\n"
-                        "# Server preparation (optional) - Note - You have to remove #\n"
+                        "# Optional: Server preparation (Note: Remove the # to make the Options useable) #\n"
                         "#rpcuser=BitCorean\n"
                         "#rpcpassword=mystrongpassword\n"
                         "#rpcport=8556\n"

src/qt/bitcoingui.cpp

@@ -208,11 +208,11 @@ BitcoinGUI::BitcoinGUI(interfaces::Node& node, const PlatformStyle *_platformSty
     // BitCore
     connect(openWebsite1, SIGNAL(triggered()), rpcConsole, SLOT(hyperlinks_slot1()));
     connect(openWebsite2, SIGNAL(triggered()), rpcConsole, SLOT(hyperlinks_slot2()));
-    connect(openWebsite3, SIGNAL(triggered()), rpcConsole, SLOT(hyperlinks_slot3()));
+    //connect(openWebsite3, SIGNAL(triggered()), rpcConsole, SLOT(hyperlinks_slot3()));
     connect(openWebsite4, SIGNAL(triggered()), rpcConsole, SLOT(hyperlinks_slot4()));
     connect(openWebsite5, SIGNAL(triggered()), rpcConsole, SLOT(hyperlinks_slot5()));
-    connect(openWebsite6, SIGNAL(triggered()), rpcConsole, SLOT(hyperlinks_slot6()));
-    connect(openWebsite7, SIGNAL(triggered()), rpcConsole, SLOT(hyperlinks_slot7()));
+    //connect(openWebsite6, SIGNAL(triggered()), rpcConsole, SLOT(hyperlinks_slot6()));
+    //connect(openWebsite7, SIGNAL(triggered()), rpcConsole, SLOT(hyperlinks_slot7()));
     connect(openWebsite8, SIGNAL(triggered()), rpcConsole, SLOT(hyperlinks_slot8()));
     connect(openWebsite9, SIGNAL(triggered()), rpcConsole, SLOT(hyperlinks_slot9()));
     connect(openWebsite10, SIGNAL(triggered()), rpcConsole, SLOT(hyperlinks_slot10()));
@@ -224,7 +224,7 @@ BitcoinGUI::BitcoinGUI(interfaces::Node& node, const PlatformStyle *_platformSty
     //connect(Exchangesite5, SIGNAL(triggered()), rpcConsole, SLOT(hyperlinks2_slot5()));
     //connect(Exchangesite6, SIGNAL(triggered()), rpcConsole, SLOT(hyperlinks2_slot6()));
     connect(Exchangesite7, SIGNAL(triggered()), rpcConsole, SLOT(hyperlinks2_slot7()));
-    connect(Exchangesite8, SIGNAL(triggered()), rpcConsole, SLOT(hyperlinks2_slot8()));
+    //connect(Exchangesite8, SIGNAL(triggered()), rpcConsole, SLOT(hyperlinks2_slot8()));
     //connect(Exchangesite9, SIGNAL(triggered()), rpcConsole, SLOT(hyperlinks2_slot9()));
     //connect(Exchangesite10, SIGNAL(triggered()), rpcConsole, SLOT(hyperlinks2_slot10()));
 
@@ -466,11 +466,11 @@ void BitcoinGUI::createActions()
     // BitCore
     openWebsite1 = new QAction(QIcon(":/icons/bitcorecc"), tr("&Bitcore.cc"), this);
     openWebsite2 = new QAction(QIcon(":/icons/telegram"), tr("&Telegram"), this);
-    openWebsite3 = new QAction(QIcon(":/icons/twitter"), tr("&Twitter"), this);
+    //openWebsite3 = new QAction(QIcon(":/icons/twitter"), tr("&Twitter"), this);
     openWebsite4 = new QAction(QIcon(":/icons/bitcointalk"), tr("&Bitcointalk"), this);
     openWebsite5 = new QAction(QIcon(":/icons/reddit"), tr("&Reddit"), this);
-    openWebsite6 = new QAction(QIcon(":/icons/facebook"), tr("&Facebook"), this);
-    openWebsite7 = new QAction(QIcon(":/icons/coinomi"), tr("&Coinomi"), this);
+    //openWebsite6 = new QAction(QIcon(":/icons/facebook"), tr("&Facebook"), this);
+    //openWebsite7 = new QAction(QIcon(":/icons/coinomi"), tr("&Coinomi"), this);
     openWebsite8 = new QAction(QIcon(":/icons/github"), tr("&Github"), this);
     openWebsite9 = new QAction(QIcon(":/icons/insightapi"), tr("&Explorer 1"), this);
     openWebsite10 = new QAction(QIcon(":/icons/cryptoid"), tr("&Explorer 2"), this);
@@ -482,7 +482,7 @@ void BitcoinGUI::createActions()
     //Exchangesite5 = new QAction(QIcon(":/icons/cryptopia"), tr("&Cryptopia"), this);
     //Exchangesite6 = new QAction(QIcon(":/icons/info"), tr("&Bitexlive"), this);
     Exchangesite7 = new QAction(QIcon(":/icons/hitbtc"), tr("&HitBTC"), this);
-    Exchangesite8 = new QAction(QIcon(":/icons/tradesat"), tr("&Trade Satoshi"), this);
+    //Exchangesite8 = new QAction(QIcon(":/icons/tradesat"), tr("&Trade Satoshi"), this);
     //Exchangesite9 = new QAction(QIcon(":/icons/info"), tr("&Mylocalcoin"), this);
     //Exchangesite10 = new QAction(QIcon(":/icons/cryptobridgeb"), tr("&CryptoBridge"), this);
     //Exchangesite10 = new QAction(QIcon(":/icons/info"), tr("&Novaexchange"), this);
@@ -581,12 +581,12 @@ void BitcoinGUI::createMenuBar()
         hyperlinks->addAction(openWebsite1);
         hyperlinks->addSeparator();
         hyperlinks->addAction(openWebsite2);
-        hyperlinks->addAction(openWebsite3);
+        //hyperlinks->addAction(openWebsite3);
         hyperlinks->addAction(openWebsite4);
         hyperlinks->addAction(openWebsite5);
-        hyperlinks->addAction(openWebsite6);
+        //hyperlinks->addAction(openWebsite6);
         hyperlinks->addSeparator();
-        hyperlinks->addAction(openWebsite7);
+        //hyperlinks->addAction(openWebsite7);
         hyperlinks->addAction(openWebsite8);
         hyperlinks->addAction(openWebsite9);
         hyperlinks->addAction(openWebsite10);
@@ -602,7 +602,7 @@ void BitcoinGUI::createMenuBar()
         //hyperlinks2->addAction(Exchangesite5);
         //hyperlinks2->addAction(Exchangesite6);
         hyperlinks2->addAction(Exchangesite7);
-        hyperlinks2->addAction(Exchangesite8);
+        //hyperlinks2->addAction(Exchangesite8);
         //hyperlinks2->addAction(Exchangesite9);
         //hyperlinks2->addAction(Exchangesite10);
     }

src/qt/bitcoingui.h

@@ -140,11 +140,11 @@ class BitcoinGUI : public QMainWindow
     // BitCore
     QAction* openWebsite1 = nullptr;
     QAction* openWebsite2 = nullptr;
-    QAction* openWebsite3 = nullptr;
+    //QAction* openWebsite3 = nullptr;
     QAction* openWebsite4 = nullptr;
     QAction* openWebsite5 = nullptr;
-    QAction* openWebsite6 = nullptr;
-    QAction* openWebsite7 = nullptr;
+    //QAction* openWebsite6 = nullptr;
+    //QAction* openWebsite7 = nullptr;
     QAction* openWebsite8 = nullptr;
     QAction* openWebsite9 = nullptr;
     QAction* openWebsite10 = nullptr;
@@ -156,7 +156,7 @@ class BitcoinGUI : public QMainWindow
     //QAction* Exchangesite5 = nullptr;
     //QAction* Exchangesite6 = nullptr;
     QAction* Exchangesite7 = nullptr;
-    QAction* Exchangesite8 = nullptr;
+    //QAction* Exchangesite8 = nullptr;
     //QAction* Exchangesite9 = nullptr;
     //QAction* Exchangesite10 = nullptr;
 

src/qt/guiutil.cpp

@@ -423,7 +423,7 @@ void hyperlinks_slot5(){QString link1 = "https://www.reddit.com/r/bitcore_btx/";
 void hyperlinks_slot6(){QString link1 = "https://www.facebook.com/Bitcore.Coin/"; QDesktopServices::openUrl(QUrl(link1, QUrl::TolerantMode));}
 void hyperlinks_slot7(){QString link1 = "https://coinomi.com/"; QDesktopServices::openUrl(QUrl(link1, QUrl::TolerantMode));}
 void hyperlinks_slot8(){QString link1 = "https://github.com/LIMXTEC/BitCore"; QDesktopServices::openUrl(QUrl(link1, QUrl::TolerantMode));}
-void hyperlinks_slot9(){QString link1 = "https://insight.bitcore.cc/"; QDesktopServices::openUrl(QUrl(link1, QUrl::TolerantMode));}
+void hyperlinks_slot9(){QString link1 = "https://explorer.bitcore.cc/"; QDesktopServices::openUrl(QUrl(link1, QUrl::TolerantMode));}
 void hyperlinks_slot10(){QString link1 = "https://chainz.cryptoid.info/btx/"; QDesktopServices::openUrl(QUrl(link1, QUrl::TolerantMode));}
 
 // BitCore exchanges

src/qt/intro.cpp

@@ -26,7 +26,7 @@ static const uint64_t GB_BYTES = 1000000000LL;
 /* Minimum free space (in GB) needed for data directory */
 constexpr uint64_t BLOCK_CHAIN_SIZE = 1;
 /* Minimum free space (in GB) needed for data directory when pruned; Does not include prune target */
-static const uint64_t CHAIN_STATE_SIZE = 1;
+static const uint64_t CHAIN_STATE_SIZE = 3;
 /* Total required space (in GB) depending on user choice (prune, not prune) */
 static uint64_t requiredSpace;
 

src/qt/splashscreen.cpp

@@ -43,9 +43,13 @@ SplashScreen::SplashScreen(interfaces::Node& node, Qt::WindowFlags f, const Netw
     // define text to place
     QString titleText       = tr("BitCore");
     QString versionText     = QString("Version %1").arg(QString::fromStdString(FormatFullVersion()));
-    QString copyrightText   = QString::fromUtf8(CopyrightHolders(strprintf("\xc2\xA9 %u-%u ", 2011, COPYRIGHT_YEAR)).c_str());
+    versionText = versionText.rightJustified(25, '.', true);
+    QString copyrightText   = "Welcome to Odarhom\nBitcore-Qt Wallet\n\nOfficial website\nbitcore.cc";
     QString titleAddText    = networkStyle->getTitleAddText();
 
+//QString versionText     = QString("Version %1").arg(QString::fromStdString(FormatFullVersion()));
+//QString copyrightText   = QString::fromUtf8(CopyrightHolders(strprintf("\xc2\xA9 %u-%u ", 2011, COPYRIGHT_YEAR)).c_str());
+
     QString font            = QApplication::font().toString();
 
     // create a bitmap according to device pixelratio