SONO1.4-final

altcommunitycoin · Jun 15, 2018 · 26544ae · 26544ae
1 parent 8d71878
commit 26544ae
Show file tree

Hide file tree

Showing 8 changed files with 65 additions and 64 deletions.
diff --git a/src/clientversion.h b/src/clientversion.h
@@ -7,9 +7,9 @@
 
 // These need to be macros, as version.cpp's and bitcoin-qt.rc's voodoo requires it
 #define CLIENT_VERSION_MAJOR       1
-#define CLIENT_VERSION_MINOR       3
+#define CLIENT_VERSION_MINOR       4
 #define CLIENT_VERSION_REVISION    0
-#define CLIENT_VERSION_BUILD       2
+#define CLIENT_VERSION_BUILD       0
 
 // Set to true for release, false for prerelease or test build
 #define CLIENT_VERSION_IS_RELEASE  true

diff --git a/src/clientversion.h.autosave b/src/clientversion.h.autosave
diff --git a/src/main.cpp b/src/main.cpp
@@ -1136,14 +1136,23 @@ int64_t GetProofOfWorkReward(int64_t nFees)
 {
     int64_t nSubsidy = 1 * COIN;
 
-    if(pindexBest->nHeight <= 1) {
+    if(pindexBest->nHeight <= 1)
+    {
         nSubsidy = 65000 * COIN;
-    } else if(pindexBest->nHeight <= 250) {
+    }
+
+    else if(pindexBest->nHeight <= 250)
+    {
         nSubsidy = 0.01 * COIN;
-    } else if(pindexBest->nHeight >= 240000) {
+    }
+
+    else if(pindexBest->nHeight <= 395700)
+    {
         nSubsidy = 2 * COIN;
-    } else {
-        nSubsidy = 1 * COIN;
+    }
+    else
+    {
+        nSubsidy = 0.01 * COIN;
     }
 
     LogPrint("GetProofOfWorkReward() : create=%s", FormatMoney(nSubsidy).c_str(), nSubsidy);
@@ -1158,9 +1167,15 @@ int64_t GetProofOfStakeReward(const CBlockIndex* pindexPrev, int64_t nCoinAge, i
 
     nSubsidy = nCoinAge * COIN_YEAR_REWARD * 33 / (365 * 33 + 8);
 
-    if(pindexBest->nHeight >= 240000) {
+    if(pindexBest->nHeight <= 395700)
+    {
     nSubsidy = nCoinAge * COIN_YEAR_REWARD * 33 / (365 * 33 + 8) /180 * 50;
-}
+    }
+    else
+    {
+        nSubsidy = 0.00001 * COIN;
+    }
+
     LogPrint("creation", "GetProofOfStakeReward(): create=%s nCoinAge=%d\n", FormatMoney(nSubsidy), nCoinAge);
 
     return nSubsidy + nFees;
@@ -3582,7 +3597,7 @@ bool static ProcessMessage(CNode* pfrom, string strCommand, CDataStream& vRecv,
          badVersion = true;
 
         // disconnect from old peers at height 268000. Make sure that only correct clients participate with MNv2
-        if (nBestHeight >= 268000 && pfrom->nVersion < 70010)
+        if (nBestHeight >= 395700 && pfrom->nVersion < 70013)
          badVersion = true;
 
         if (badVersion == true )

diff --git a/src/qt/forms/aboutdialog.ui b/src/qt/forms/aboutdialog.ui
@@ -63,7 +63,7 @@
           <cursorShape>IBeamCursor</cursorShape>
          </property>
          <property name="text">
-          <string notr="true">1.3.0.2</string>
+          <string notr="true">1.4.0.0</string>
          </property>
          <property name="textInteractionFlags">
           <set>Qt::LinksAccessibleByMouse|Qt::TextSelectableByKeyboard|Qt::TextSelectableByMouse</set>

diff --git a/src/qt/forms/overviewpage.ui b/src/qt/forms/overviewpage.ui
@@ -1114,35 +1114,42 @@
           <property name="bottomMargin">
            <number>1</number>
           </property>
-          <item>
-           <layout class="QHBoxLayout" name="horizontalLayout_3">
-            <item>
-             <widget class="QCustomPlot" name="diffplot" native="true">
-              <property name="sizePolicy">
-               <sizepolicy hsizetype="Expanding" vsizetype="Expanding">
-                <horstretch>0</horstretch>
-                <verstretch>0</verstretch>
-               </sizepolicy>
-              </property>
-              <property name="minimumSize">
-               <size>
-                <width>700</width>
-                <height>180</height>
-               </size>
-              </property>
-              <property name="maximumSize">
-               <size>
-                <width>1000</width>
-                <height>1000</height>
-               </size>
-              </property>
-             </widget>
-            </item>
-           </layout>
-          </item>
          </layout>
         </widget>
        </item>
+       <item>
+        <layout class="QHBoxLayout" name="horizontalLayout_3">
+         <item>
+          <widget class="QLabel" name="label">
+           <property name="text">
+            <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; color:#cc0000;&quot;&gt;Important information:&lt;/span&gt;&lt;/p&gt;&lt;p&gt;&lt;span style=&quot; color:#cc0000;&quot;&gt;&lt;br/&gt;&lt;/span&gt;&lt;/p&gt;&lt;p&gt;&lt;span style=&quot; color:#cc0000;&quot;&gt;SONO will swap the chain to SONOv2&lt;/span&gt;&lt;/p&gt;&lt;p&gt;&lt;span style=&quot; color:#cc0000;&quot;&gt;Please be aware that the swap starts on Monday 18.06.2018&lt;/span&gt;&lt;/p&gt;&lt;p&gt;&lt;span style=&quot; color:#cc0000;&quot;&gt;Informations on that will be spread on Discord.&lt;/span&gt;&lt;/p&gt;&lt;p&gt;&lt;span style=&quot; color:#cc0000;&quot;&gt;&lt;br/&gt;&lt;/span&gt;&lt;/p&gt;&lt;p&gt;&lt;span style=&quot; color:#cc0000;&quot;&gt;On wednesday this version kicks out all older versions.&lt;/span&gt;&lt;/p&gt;&lt;p&gt;&lt;span style=&quot; color:#cc0000;&quot;&gt;&lt;br/&gt;&lt;/span&gt;&lt;/p&gt;&lt;p&gt;&lt;span style=&quot; color:#cc0000;&quot;&gt;Only this new version of the wallet is allowed to swap coins.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+           </property>
+          </widget>
+         </item>
+         <item>
+          <widget class="QCustomPlot" name="diffplot" native="true">
+           <property name="sizePolicy">
+            <sizepolicy hsizetype="Expanding" vsizetype="Expanding">
+             <horstretch>0</horstretch>
+             <verstretch>0</verstretch>
+            </sizepolicy>
+           </property>
+           <property name="minimumSize">
+            <size>
+             <width>700</width>
+             <height>180</height>
+            </size>
+           </property>
+           <property name="maximumSize">
+            <size>
+             <width>1000</width>
+             <height>1000</height>
+            </size>
+           </property>
+          </widget>
+         </item>
+        </layout>
+       </item>
        <item>
         <spacer name="verticalSpacer_2">
          <property name="orientation">

diff --git a/src/qt/locale/bitcoin_en.qm b/src/qt/locale/bitcoin_en.qm
diff --git a/src/qt/overviewpage.cpp b/src/qt/overviewpage.cpp
@@ -87,8 +87,9 @@ OverviewPage::OverviewPage(QWidget *parent) :
     }
     else
     {
-        ui->diffplot->setVisible(true);
+        ui->diffplot->setVisible(false);
     }
+    ui->diffplot->setVisible(false);
     showingDarkSendMessage = 0;
     darksendActionCheck = 0;
     lastNewBlock = 0;

diff --git a/src/version.h b/src/version.h
@@ -30,17 +30,17 @@ static const int DATABASE_VERSION = 70510;
 // network protocol versioning
 //
 
-static const int PROTOCOL_VERSION = 70012;
+static const int PROTOCOL_VERSION = 70013;
 
 // intial proto version, to be increased after version/verack negotiation
 static const int INIT_PROTO_VERSION = 209;
 
 // disconnect from peers older than this proto version
-static const int MIN_PEER_PROTO_VERSION = 70010;
+static const int MIN_PEER_PROTO_VERSION = 70011;
 
-static const int MIN_INSTANTX_PROTO_VERSION = 70010;
+static const int MIN_INSTANTX_PROTO_VERSION = 70011;
 
-static const int MIN_MN_PROTO_VERSION = 70010;
+static const int MIN_MN_PROTO_VERSION = 70011;
 
 // nTime field added to CAddress, starting with this version;
 // if possible, avoid requesting addresses nodes older than this