v. 1.0.2.0 further fixes and enable GUI resize

XDNA-Core · Jun 27, 2018 · 479840d · 479840d
1 parent c17abf4
commit 479840d
Show file tree

Hide file tree

Showing 9 changed files with 213 additions and 185 deletions.
diff --git a/configure.ac b/configure.ac
@@ -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, 2018)

diff --git a/src/clientversion.h b/src/clientversion.h
@@ -16,7 +16,7 @@
 //! These need to be macros, as clientversion.cpp's and xdna*-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

diff --git a/src/main.cpp b/src/main.cpp
diff --git a/src/masternode-payments.h b/src/masternode-payments.h
@@ -124,7 +124,6 @@ class CMasternodeBlockPayees
         return payment != vecPayments.cend();
     }
 
-    //fixme: CMasternodeBlockPayees::IsTransactionValid +MN level
     bool IsTransactionValid(const CTransaction& txNew);
     std::string GetRequiredPaymentsString();
 

diff --git a/src/masternode-sync.cpp b/src/masternode-sync.cpp
@@ -315,8 +315,10 @@ void CMasternodeSync::Process()
                 if (RequestedMasternodeAttempt >= MASTERNODE_SYNC_THRESHOLD * 3)
                     return;
 
-                if(mnodeman.DsegUpdate(pnode))
-                    ++RequestedMasternodeAttempt;
+                if(!mnodeman.DsegUpdate(pnode))
+                    continue;
+
+                ++RequestedMasternodeAttempt;
 
                 return;
             }
@@ -358,8 +360,10 @@ void CMasternodeSync::Process()
                 if (!chainActive.Tip())
                     return;
 
-                if(mnodeman.WinnersUpdate(pnode))
-                    ++RequestedMasternodeAttempt;
+                if(!mnodeman.WinnersUpdate(pnode))
+                    continue;
+
+                ++RequestedMasternodeAttempt;
 
                 return;
             }

diff --git a/src/net.cpp b/src/net.cpp
@@ -1369,25 +1369,30 @@ void ThreadMessageHandler()
     boost::mutex condition_mutex;
     boost::unique_lock<boost::mutex> lock(condition_mutex);
 
+    static int64_t nLastRebroadcast = 0;
+
     SetThreadPriority(THREAD_PRIORITY_BELOW_NORMAL);
     while (true) {
         vector<CNode*> vNodesCopy;
         {
             LOCK(cs_vNodes);
             vNodesCopy = vNodes;
-            BOOST_FOREACH (CNode* pnode, vNodesCopy) {
+            for (CNode* pnode : vNodesCopy) {
                 pnode->AddRef();
             }
         }
 
         // Poll the connected nodes for messages
-        CNode* pnodeTrickle = NULL;
+        CNode* pnodeTrickle = nullptr;
         if (!vNodesCopy.empty())
             pnodeTrickle = vNodesCopy[GetRand(vNodesCopy.size())];
 
         bool fSleep = true;
 
-        BOOST_FOREACH (CNode* pnode, vNodesCopy) {
+        bool performRebroadcast = !IsInitialBlockDownload() && (GetTime() - nLastRebroadcast > 24 * 60 * 60);
+
+        for (CNode* pnode : vNodesCopy) {
+
             if (pnode->fDisconnect)
                 continue;
 
@@ -1410,16 +1415,30 @@ void ThreadMessageHandler()
             // Send messages
             {
                 TRY_LOCK(pnode->cs_vSend, lockSend);
-                if (lockSend)
+
+                if(lockSend) {
+
                     g_signals.SendMessages(pnode, pnode == pnodeTrickle || pnode->fWhitelisted);
+
+                    if(performRebroadcast) {
+
+                        // Periodically clear setAddrKnown to allow refresh broadcasts
+                        if (nLastRebroadcast)
+                            pnode->setAddrKnown.clear();
+
+                        // Rebroadcast our address
+                        AdvertiseLocal(pnode);
+
+                        nLastRebroadcast = GetTime();
+                    }
+                }
             }
             boost::this_thread::interruption_point();
         }
 
-
         {
             LOCK(cs_vNodes);
-            BOOST_FOREACH (CNode* pnode, vNodesCopy)
+            for (CNode* pnode : vNodesCopy)
                 pnode->Release();
         }
 

diff --git a/src/qt/bitcoingui.cpp b/src/qt/bitcoingui.cpp
@@ -120,7 +120,7 @@ BitcoinGUI::BitcoinGUI(const NetworkStyle* networkStyle, QWidget* parent) : QMai
 this->setStyleSheet(GUIUtil::loadStyleSheet());
 
 GUIUtil::restoreWindowGeometry("nWindow", QSize(1065, 670), this);
-this->setFixedSize(1065,670);
+//this->setFixedSize(1065,670);
 QFontDatabase::addApplicationFont(":/fonts/xdna_font");
 
 QString windowTitle = tr("XDNA Core") + " - ";

diff --git a/src/qt/forms/overviewpage.ui b/src/qt/forms/overviewpage.ui
@@ -59,8 +59,8 @@
        </property>
        <property name="maximumSize">
         <size>
-         <width>1065</width>
-         <height>220</height>
+         <width>16777215</width>
+         <height>16777215</height>
         </size>
        </property>
        <property name="sizeIncrement">
@@ -92,8 +92,8 @@
           </property>
           <property name="maximumSize">
            <size>
-            <width>345</width>
-            <height>200</height>
+            <width>16777215</width>
+            <height>16777215</height>
            </size>
           </property>
           <property name="frameShape">
@@ -275,8 +275,8 @@
           </property>
           <property name="maximumSize">
            <size>
-            <width>345</width>
-            <height>200</height>
+            <width>16777215</width>
+            <height>16777215</height>
            </size>
           </property>
           <property name="frameShape">
@@ -300,7 +300,7 @@
                <item>
                 <widget class="QLabel" name="labelBalance">
                  <property name="text">
-                  <string>0.000 000 00</string>
+                  <string>0.00</string>
                  </property>
                  <property name="alignment">
                   <set>Qt::AlignBottom|Qt::AlignLeading|Qt::AlignLeft</set>
@@ -344,7 +344,7 @@
                <item>
                 <widget class="QLabel" name="labelUnconfirmed">
                  <property name="text">
-                  <string>0.000 000 00</string>
+                  <string>0.00</string>
                  </property>
                  <property name="alignment">
                   <set>Qt::AlignBottom|Qt::AlignLeading|Qt::AlignLeft</set>
@@ -388,7 +388,7 @@
                <item>
                 <widget class="QLabel" name="labelImmature">
                  <property name="text">
-                  <string>0.000 000 00</string>
+                  <string>0.00</string>
                  </property>
                  <property name="alignment">
                   <set>Qt::AlignBottom|Qt::AlignLeading|Qt::AlignLeft</set>
@@ -425,6 +425,19 @@
           </layout>
          </widget>
         </item>
+        <item>
+         <spacer name="horizontalSpacer_9">
+          <property name="orientation">
+           <enum>Qt::Horizontal</enum>
+          </property>
+          <property name="sizeHint" stdset="0">
+           <size>
+            <width>40</width>
+            <height>20</height>
+           </size>
+          </property>
+         </spacer>
+        </item>
         <item>
          <widget class="QFrame" name="frame_blue_3">
           <property name="minimumSize">
@@ -435,8 +448,8 @@
           </property>
           <property name="maximumSize">
            <size>
-            <width>345</width>
-            <height>200</height>
+            <width>16777215</width>
+            <height>16777215</height>
            </size>
           </property>
           <property name="frameShape">
@@ -466,7 +479,7 @@
        <property name="maximumSize">
         <size>
          <width>16777215</width>
-         <height>500</height>
+         <height>16777215</height>
         </size>
        </property>
        <property name="frameShape">
@@ -489,8 +502,8 @@
           </property>
           <property name="maximumSize">
            <size>
-            <width>355</width>
-            <height>600</height>
+            <width>16777215</width>
+            <height>16777215</height>
            </size>
           </property>
           <property name="frameShape">
@@ -613,7 +626,7 @@
                            <property name="maximumSize">
                             <size>
                              <width>16777215</width>
-                             <height>20</height>
+                             <height>16777215</height>
                             </size>
                            </property>
                            <property name="value">
@@ -635,7 +648,7 @@
                            <property name="maximumSize">
                             <size>
                              <width>16777215</width>
-                             <height>20</height>
+                             <height>16777215</height>
                             </size>
                            </property>
                            <property name="value">
@@ -657,7 +670,7 @@
                            <property name="maximumSize">
                             <size>
                              <width>16777215</width>
-                             <height>20</height>
+                             <height>16777215</height>
                             </size>
                            </property>
                            <property name="value">
@@ -1299,7 +1312,7 @@
           <property name="maximumSize">
            <size>
             <width>16777215</width>
-            <height>600</height>
+            <height>16777215</height>
            </size>
           </property>
           <property name="frameShape">

diff --git a/src/qt/res/css/default.css b/src/qt/res/css/default.css
@@ -650,7 +650,7 @@
 
      QWidget .QFrame#frame_blue { /*blue frame */
 
-        background-image: url(':/images/frame_blue');
+        border-image: url(':/images/frame_blue') 0 0 0 0 stretch stretch;
         background-repeat:none;
         border-style: none;
        }