catchup to v10.4.4 release

COPYING

@@ -1,6 +1,6 @@
-Copyright (c) 2009-2016 Bitcoin Developers
-Copyright (c) 2011-2016 Litecoin Developers
-Copyright (c) 2013-2016 Florincoin Developers
+Copyright (c) 2009-2017 Bitcoin Developers
+Copyright (c) 2011-2017 Litecoin Developers
+Copyright (c) 2013-2017 Florincoin Developers
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

configure.ac

@@ -3,9 +3,9 @@ AC_PREREQ([2.60])
 define(_CLIENT_VERSION_MAJOR, 0)
 define(_CLIENT_VERSION_MINOR, 10)
 define(_CLIENT_VERSION_REVISION, 4)
-define(_CLIENT_VERSION_BUILD, 0)
+define(_CLIENT_VERSION_BUILD, 6)
 define(_CLIENT_VERSION_IS_RELEASE, true)
-define(_COPYRIGHT_YEAR, 2016)
+define(_COPYRIGHT_YEAR, 2017)
 AC_INIT([Florincoin Core],[_CLIENT_VERSION_MAJOR._CLIENT_VERSION_MINOR._CLIENT_VERSION_REVISION._CLIENT_VERSION_BUILD],[[email protected]],[florincoin])
 AC_CONFIG_SRCDIR([src/main.cpp])
 AC_CONFIG_HEADERS([src/config/bitcoin-config.h])

src/chainparams.cpp

@@ -71,11 +71,16 @@ static Checkpoints::MapCheckpoints mapCheckpoints =
         (696454, uint256("0x8cfb75684405e22f8f69522ec11f1e5206758e37f25db13880548f69fe6f1976"))
         (955000, uint256("0xb5517a50aee6af59eb0ab4ee3262bcbaf3f6672b9301cdd3302e4bab491e7526"))
        (1505017, uint256("0xd38b306850bb26a5c98400df747d4391bb4e359e95e20dc79b50063ed3c5bfa7"))
+       (1678879, uint256("0x1e874e2852e8dfb3553f0e6c02dcf70e9f5697effa31385d25a3c88fe26676fc"))
+       (1678909, uint256("0x4c5a1040e337a542e6717904c8346bd72151fc34c390dff7b5cf23dcedc5058a"))
+       (1679162, uint256("0xb32c64fb80a4196ff3e1be883db10629e1d7cd27c00ef0b5d1fe54af481fc10f"))
+       (1796633, uint256("0xc2da8b936a7f2c0de02aa0c6c45f3d971ebad78655255a945b0e60b62f27d445"))
+       (2094558, uint256("0x946616c88286f32bfac15868456d87a86f8611e1f9b56594b81e46831ce43f81"))
         ;
 static const Checkpoints::CCheckpointData data = {
         &mapCheckpoints,
-        1449731549, // * UNIX timestamp of last checkpoint block
-        1993612,   // * total number of transactions between genesis and last checkpoint
+        1488680849, // * UNIX timestamp of last checkpoint block
+        2660400,   // * total number of transactions between genesis and last checkpoint
                     //   (the tx=... number in the SetBestChain debug.log lines)
         2160.0     // * estimated number of transactions per day after checkpoint
     };
@@ -201,6 +206,12 @@ class CMainParams : public CChainParams {
         vSeeds.push_back(CDNSSeedData("seed2.florincoin.com", "seed2.florincoin.com"));
         vSeeds.push_back(CDNSSeedData("seed3.florincoin.com", "seed3.florincoin.com"));
         vSeeds.push_back(CDNSSeedData("seed4.florincoin.com", "seed4.florincoin.com"));
+        vSeeds.push_back(CDNSSeedData("nyc2.entertheblockchain.com", "nyc2.entertheblockchain.com"));
+        vSeeds.push_back(CDNSSeedData("sf1.entertheblockchain.com", "sf1.entertheblockchain.com"));
+        vSeeds.push_back(CDNSSeedData("am2.entertheblockchain.com", "am2.entertheblockchain.com"));
+        vSeeds.push_back(CDNSSeedData("sgp.entertheblockchain.com", "sgp.entertheblockchain.com"));
+        vSeeds.push_back(CDNSSeedData("ind.entertheblockchain.com", "ind.entertheblockchain.com"));
+        vSeeds.push_back(CDNSSeedData("de.entertheblockchain.com", "de.entertheblockchain.com"));
 
         base58Prefixes[PUBKEY_ADDRESS] = list_of(35);
         base58Prefixes[SCRIPT_ADDRESS] = list_of(8);

src/clientversion.h

@@ -17,7 +17,7 @@
 #define CLIENT_VERSION_MAJOR 0
 #define CLIENT_VERSION_MINOR 10
 #define CLIENT_VERSION_REVISION 4
-#define CLIENT_VERSION_BUILD 0
+#define CLIENT_VERSION_BUILD 6
 
 //! Set to true for release, false for prerelease or test build
 #define CLIENT_VERSION_IS_RELEASE true
@@ -26,7 +26,7 @@
  * Copyright year (2009-this)
  * Todo: update this when changing our copyright comments in the source
  */
-#define COPYRIGHT_YEAR 2016
+#define COPYRIGHT_YEAR 2017
 
 #endif //HAVE_CONFIG_H
 
@@ -38,7 +38,7 @@
 #define DO_STRINGIZE(X) #X
 
 //! Copyright string used in Windows .rc files
-#define COPYRIGHT_STR "2009-" STRINGIZE(COPYRIGHT_YEAR) " The Bitcoin Core Developers"
+#define COPYRIGHT_STR "2009-" STRINGIZE(COPYRIGHT_YEAR) " The Bitcoin, Litecoin and Florincoin Developers"
 
 /**
  * bitcoind-res.rc includes this file, but it cannot cope with real c++ code.

src/main.cpp

@@ -3688,8 +3688,9 @@ bool static ProcessMessage(CNode* pfrom, string strCommand, CDataStream& vRecv,
         }
 
         // Disconnect certain incompatible clients
-        const char *badSubVers[] = { "/potcoinseeder", "/reddcoinseeder", "/worldcoinseeder" };
-        for (int x = 0; x < 3; x++)
+        const char *badSubVers[] = { "/potcoinseeder", "/reddcoinseeder", "/worldcoinseeder",
+            "/Satoshi:0.8." };
+        for (int x = 0; x < 4; x++)
         {
             if (pfrom->cleanSubVer.find(badSubVers[x], 0) == 0)
             {

src/qt/forms/helpmessagedialog.ui

@@ -16,7 +16,7 @@
    </font>
   </property>
   <property name="windowTitle">
-   <string notr="true">Litecoin Core - Command-line options</string>
+   <string notr="true">Florincoin Core - Command-line options</string>
   </property>
   <layout class="QHBoxLayout" name="horizontalLayout_2">
    <item>

src/qt/forms/intro.ui

@@ -20,7 +20,7 @@
       <string notr="true">QLabel { font-style:italic; }</string>
      </property>
      <property name="text">
-      <string>Welcome to Litecoin Core.</string>
+      <string>Welcome to Florincoin Core.</string>
      </property>
      <property name="wordWrap">
       <bool>true</bool>
@@ -46,7 +46,7 @@
    <item>
     <widget class="QLabel" name="label_4">
      <property name="text">
-      <string>As this is the first time the program is launched, you can choose where Litecoin Core will store its data.</string>
+      <string>As this is the first time the program is launched, you can choose where Florincoin Core will store its data.</string>
      </property>
      <property name="wordWrap">
       <bool>true</bool>
@@ -56,7 +56,7 @@
    <item>
     <widget class="QLabel" name="sizeWarningLabel">
      <property name="text">
-      <string>Litecoin Core will download and store a copy of the Litecoin block chain. At least %1GB of data will be stored in this directory, and it will grow over time. The wallet will also be stored in this directory.</string>
+      <string>Florincoin Core will download and store a copy of the Florincoin block chain. At least %1GB of data will be stored in this directory, and it will grow over time. The wallet will also be stored in this directory.</string>
      </property>
      <property name="wordWrap">
       <bool>true</bool>

src/qt/forms/optionsdialog.ui

@@ -30,10 +30,10 @@
        <item>
         <widget class="QCheckBox" name="bitcoinAtStartup">
          <property name="toolTip">
-          <string>Automatically start Litecoin after logging in to the system.</string>
+          <string>Automatically start Florincoin after logging in to the system.</string>
          </property>
          <property name="text">
-          <string>&amp;Start Litecoin on system login</string>
+          <string>&amp;Start Florincoin on system login</string>
          </property>
         </widget>
        </item>
@@ -189,7 +189,7 @@
        <item>
         <widget class="QCheckBox" name="mapPortUpnp">
          <property name="toolTip">
-          <string>Automatically open the Litecoin client port on the router. This only works when your router supports UPnP and it is enabled.</string>
+          <string>Automatically open the Florincoin client port on the router. This only works when your router supports UPnP and it is enabled.</string>
          </property>
          <property name="text">
           <string>Map port using &amp;UPnP</string>
@@ -209,7 +209,7 @@
        <item>
         <widget class="QCheckBox" name="connectSocks">
          <property name="toolTip">
-          <string>Connect to the Litecoin network through a SOCKS5 proxy.</string>
+          <string>Connect to the Florincoin network through a SOCKS5 proxy.</string>
          </property>
          <property name="text">
           <string>&amp;Connect through SOCKS5 proxy (default proxy):</string>
@@ -375,7 +375,7 @@
          <item>
           <widget class="QValueComboBox" name="lang">
            <property name="toolTip">
-            <string>The user interface language can be set here. This setting will take effect after restarting Litecoin.</string>
+            <string>The user interface language can be set here. This setting will take effect after restarting Florincoin.</string>
            </property>
           </widget>
          </item>

src/qt/forms/overviewpage.ui

@@ -64,7 +64,7 @@
                <cursorShape>WhatsThisCursor</cursorShape>
               </property>
               <property name="toolTip">
-               <string>The displayed information may be out of date. Your wallet automatically synchronizes with the Litecoin network after a connection is established, but this process has not completed yet.</string>
+               <string>The displayed information may be out of date. Your wallet automatically synchronizes with the Florincoin network after a connection is established, but this process has not completed yet.</string>
               </property>
               <property name="styleSheet">
                <string notr="true">QLabel { color: red; }</string>
@@ -436,7 +436,7 @@
                <cursorShape>WhatsThisCursor</cursorShape>
               </property>
               <property name="toolTip">
-               <string>The displayed information may be out of date. Your wallet automatically synchronizes with the Litecoin network after a connection is established, but this process has not completed yet.</string>
+               <string>The displayed information may be out of date. Your wallet automatically synchronizes with the Florincoin network after a connection is established, but this process has not completed yet.</string>
               </property>
               <property name="styleSheet">
                <string notr="true">QLabel { color: red; }</string>

src/qt/forms/receivecoinsdialog.ui

@@ -48,7 +48,7 @@
         <item row="6" column="0">
          <widget class="QLabel" name="label_3">
           <property name="toolTip">
-           <string>An optional message to attach to the payment request, which will be displayed when the request is opened. Note: The message will not be sent with the payment over the Litecoin network.</string>
+           <string>An optional message to attach to the payment request, which will be displayed when the request is opened. Note: The message will not be sent with the payment over the Florincoin network.</string>
           </property>
           <property name="text">
            <string>&amp;Message:</string>
@@ -71,7 +71,7 @@
         <item row="6" column="2">
          <widget class="QLineEdit" name="reqMessage">
           <property name="toolTip">
-           <string>An optional message to attach to the payment request, which will be displayed when the request is opened. Note: The message will not be sent with the payment over the Litecoin network.</string>
+           <string>An optional message to attach to the payment request, which will be displayed when the request is opened. Note: The message will not be sent with the payment over the Florincoin network.</string>
           </property>
          </widget>
         </item>

src/qt/forms/rpcconsole.ui

@@ -331,7 +331,7 @@
        <item row="15" column="0">
         <widget class="QPushButton" name="openDebugLogfileButton">
          <property name="toolTip">
-          <string>Open the Litecoin debug log file from the current data directory. This can take a few seconds for large log files.</string>
+          <string>Open the Florincoin debug log file from the current data directory. This can take a few seconds for large log files.</string>
          </property>
          <property name="text">
           <string>&amp;Open</string>

src/qt/forms/sendcoinsdialog.ui

@@ -904,7 +904,7 @@
                  <item>
                   <widget class="QCheckBox" name="checkBoxMinimumFee">
                    <property name="toolTip">
-                    <string>Paying only the minimum fee is just fine as long as there is less transaction volume than space in the blocks. But be aware that this can end up in a never confirming transaction once there is more demand for litecoin transactions than the network can process.</string>
+                    <string>Paying only the minimum fee is just fine as long as there is less transaction volume than space in the blocks. But be aware that this can end up in a never confirming transaction once there is more demand for florincoin transactions than the network can process.</string>
                    </property>
                    <property name="text">
                     <string/>
@@ -917,7 +917,7 @@
                     <bool>true</bool>
                    </property>
                    <property name="toolTip">
-                    <string>Paying only the minimum fee is just fine as long as there is less transaction volume than space in the blocks. But be aware that this can end up in a never confirming transaction once there is more demand for litecoin transactions than the network can process.</string>
+                    <string>Paying only the minimum fee is just fine as long as there is less transaction volume than space in the blocks. But be aware that this can end up in a never confirming transaction once there is more demand for florincoin transactions than the network can process.</string>
                    </property>
                    <property name="text">
                     <string>(read the tooltip)</string>

src/qt/forms/sendcoinsentry.ui

@@ -51,7 +51,7 @@
       <item>
        <widget class="QValidatedLineEdit" name="payTo">
         <property name="toolTip">
-         <string>The Litecoin address to send the payment to</string>
+         <string>The Florincoin address to send the payment to</string>
         </property>
        </widget>
       </item>
@@ -154,7 +154,7 @@
     <item row="3" column="1">
      <widget class="QLabel" name="messageTextLabel">
       <property name="toolTip">
-       <string>A message that was attached to the litecoin: URI which will be stored with the transaction for your reference. Note: This message will not be sent over the Litecoin network.</string>
+       <string>A message that was attached to the florincoin: URI which will be stored with the transaction for your reference. Note: This message will not be sent over the Florincoin network.</string>
       </property>
       <property name="textFormat">
        <enum>Qt::PlainText</enum>

src/qt/forms/signverifymessagedialog.ui

@@ -48,7 +48,7 @@
          <item>
           <widget class="QValidatedLineEdit" name="addressIn_SM">
            <property name="toolTip">
-            <string>The Litecoin address to sign the message with</string>
+            <string>The Florincoin address to sign the message with</string>
            </property>
           </widget>
          </item>
@@ -152,7 +152,7 @@
          <item>
           <widget class="QPushButton" name="signMessageButton_SM">
            <property name="toolTip">
-            <string>Sign the message to prove you own this Litecoin address</string>
+            <string>Sign the message to prove you own this Florincoin address</string>
            </property>
            <property name="text">
             <string>Sign &amp;Message</string>
@@ -258,7 +258,7 @@
          <item>
           <widget class="QValidatedLineEdit" name="addressIn_VM">
            <property name="toolTip">
-            <string>The Litecoin address the message was signed with</string>
+            <string>The Florincoin address the message was signed with</string>
            </property>
           </widget>
          </item>
@@ -295,7 +295,7 @@
          <item>
           <widget class="QPushButton" name="verifyMessageButton_VM">
            <property name="toolTip">
-            <string>Verify the message to ensure it was signed with the specified Litecoin address</string>
+            <string>Verify the message to ensure it was signed with the specified Florincoin address</string>
            </property>
            <property name="text">
             <string>Verify &amp;Message</string>