Netbox.Wallet v3.4.0.2

NetboxGlobal · Apr 29, 2020 · d6db983 · d6db983
1 parent cf989fc
commit d6db983
Show file tree

Hide file tree

Showing 36 changed files with 156 additions and 241 deletions.
diff --git a/.dockerignore b/.dockerignore
@@ -90,6 +90,8 @@ src/qt/test/moc*.cpp
 **/*.json.h
 **/*.raw.h
 
+contrib/linearize/linearize.cfg
+
 #libtool object files
 **/*.lo
 **/*.la

diff --git a/.gitignore b/.gitignore
@@ -73,6 +73,8 @@ src/qt/test/moc*.cpp
 *.json.h
 *.raw.h
 
+contrib/linearize/linearize.cfg
+
 #libtool object files
 *.lo
 *.la

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, 3)
 define(_CLIENT_VERSION_MINOR, 4)
-define(_CLIENT_VERSION_BUILD, 1)
+define(_CLIENT_VERSION_BUILD, 2)
 define(_CLIENT_VERSION_REVISION, 0)
 define(_CLIENT_VERSION_IS_RELEASE, true)
 define(_COPYRIGHT_YEAR, 2020)

diff --git a/contrib/linearize/example-linearize.cfg b/contrib/linearize/example-linearize.cfg
@@ -3,16 +3,16 @@
 rpcuser=someuser
 rpcpassword=somepassword
 host=127.0.0.1
-port=51470
+port=28735
 
 # bootstrap.dat hashlist settings (linearize-hashes)
-max_height=313000
+max_height=400000
 
 # bootstrap.dat input/output settings (linearize-data)
-netmagic=90c4fde9
-input=/home/example/.bitcoin/blocks
-output_file=/home/example/Downloads/bootstrap.dat
-hashlist=hashlist.txt
+netmagic=a549549e
+input=/root/.NetboxWallet/blocks
+output_file=/root/bootstrap.dat
+hashlist=/root/hashlist.txt
 split_year=1
 
 # Maxmimum size in bytes of out-of-order blocks cache in memory

diff --git a/contrib/linearize/linearize-data.py b/contrib/linearize/linearize-data.py
@@ -291,7 +291,7 @@ def run(self):
 	blkindex = get_block_hashes(settings)
 	blkmap = mkblockmap(blkindex)
 
-	if not "0000041e482b9b9691d98eefb48473405c0b8ec31b76df3797c74a78680ef818" in blkmap:
+	if not "000000077c8f4eabb532fdacc3eb56825d3bcf1401e4958b9a2317cc7d8b0496" in blkmap:
 		print("not found")
 	else:
 		BlockDataCopier(settings, blkindex, blkmap).run()

diff --git a/src/init.cpp b/src/init.cpp
@@ -72,6 +72,7 @@ DAppStore* pdAppStore = NULL;
 int nWalletBackups = 10;
 #endif
 bool walletLoaded = false;
+bool appInitialized = false;
 bool lockFailed = false;
 volatile bool fFeeEstimatesInitialized = false;
 volatile bool fRestartRequested = false; // true: restart false: shutdown
@@ -209,9 +210,10 @@ void PrepareShutdown()
     StopRPC();
     StopHTTPServer();
 #ifdef ENABLE_WALLET
-    if (pwalletMain)
+    if (pwalletMain) {
         bitdb.Flush(false);
-    GenerateBitcoins(false, NULL, 0);
+        GenerateBitcoins(false, NULL, 0);
+    }
 #endif
     StopNode();
     DumpMasternodes();
@@ -299,8 +301,10 @@ void Shutdown()
     // Shutdown part 2: Stop TOR thread and delete wallet instance
     StopTorControl();
 #ifdef ENABLE_WALLET
-    delete pwalletMain;
-    pwalletMain = NULL;
+    if (pwalletMain) {
+        delete pwalletMain;
+        pwalletMain = NULL;
+    }
     if (pdAppStore) {
         delete pdAppStore;
         pdAppStore = NULL;
@@ -744,15 +748,15 @@ bool lockFile(const boost::filesystem::path &filename, const boost::posix_time::
     while (boost::posix_time::microsec_clock::universal_time() < abs_time){
         boost::interprocess::spin_wait swait;
         if (LockFileEx(lock, LOCKFILE_EXCLUSIVE_LOCK | LOCKFILE_FAIL_IMMEDIATELY, 0, -1, -1, &overlapped)) {
-            CloseHandle(lock);
+            //CloseHandle(lock);
             return true;
         }
         swait.yield();
     }
     CloseHandle(lock);
     return false;
 #else
-    boost::interprocess::file_lock lock(filename.string().c_str());
+    static boost::interprocess::file_lock lock(filename.string().c_str());
     return lock.timed_lock(abs_time);
 #endif
 }
@@ -1892,5 +1896,7 @@ bool AppInit2()
     }
 #endif
 
+    appInitialized = true;
+
     return !fRequestShutdown;
 }
diff --git a/src/nbxd.cpp b/src/nbxd.cpp
@@ -69,6 +69,11 @@ void segFaultHandler(int signum)
 }
 #endif
 
+int rpcShow()
+{
+    return 4;
+}
+
 //////////////////////////////////////////////////////////////////////////////
 //
 // Start

diff --git a/src/qt/bitcoingui.cpp b/src/qt/bitcoingui.cpp
@@ -1243,12 +1243,10 @@ void BitcoinGUI::showNormalIfMinimized(bool fToggleHidden)
         return;
 
     // activateWindow() (sometimes) helps with keyboard focus on Windows
-    if (isHidden()) {
+    if (isMinimized() || isHidden()) {
+        setWindowState(windowState() & ~Qt::WindowMinimized | Qt::WindowActive);
         show();
         activateWindow();
-    } else if (isMinimized()) {
-        showNormal();
-        activateWindow();
     } else if (GUIUtil::isObscured(this)) {
         raise();
         activateWindow();
@@ -1266,6 +1264,8 @@ void BitcoinGUI::detectShutdown()
     if (ShutdownRequested()) {
         if (rpcConsole)
             rpcConsole->hide();
+        if (explorerWindow)
+            explorerWindow->hide();
         emit requestedShutdown();
     }
 }

diff --git a/src/qt/forms/optionsdialog.ui b/src/qt/forms/optionsdialog.ui
@@ -399,35 +399,6 @@
          </item>
         </layout>
        </item>
-       <item>
-        <widget class="QLabel" name="label_3">
-         <property name="toolTip">
-          <string notr="true"/>
-         </property>
-         <property name="statusTip">
-          <string notr="true"/>
-         </property>
-         <property name="whatsThis">
-          <string notr="true"/>
-         </property>
-         <property name="accessibleName">
-          <string notr="true"/>
-         </property>
-         <property name="text">
-          <string>Language missing or translation incomplete? Help contributing translations here:
-https://www.transifex.com/pivx-project/pivx-project-translations</string>
-         </property>
-         <property name="wordWrap">
-          <bool>true</bool>
-         </property>
-         <property name="openExternalLinks">
-          <bool>true</bool>
-         </property>
-         <property name="textInteractionFlags">
-          <set>Qt::TextBrowserInteraction</set>
-         </property>
-        </widget>
-       </item>
        <item>
         <layout class="QHBoxLayout" name="horizontalLayout_2_Display" stretch="0,0">
          <item>

diff --git a/src/qt/locale/nbx_bg.ts b/src/qt/locale/nbx_bg.ts
@@ -1611,12 +1611,6 @@ Please be patient after clicking import.</source>
         <source>The user interface language can be set here. This setting will take effect after restarting Netbox.Wallet.</source>
         <translation>Промяна на езика. Настройката е активна след рестарт на портфейла.</translation>
     </message>
-    <message>
-        <source>Language missing or translation incomplete? Help contributing translations here:
-https://www.transifex.com/pivx-project/pivx-project-translations</source>
-        <translation>Липсващ език или непълен превод? Помогнете с преводите тук:
-https://www.transifex.com/pivx-project/pivx-project-translations</translation>
-    </message>
     <message>
         <source>Map port using &amp;UPnP</source>
         <translation>Картографирай портовете използвайки &amp;UPnP</translation>

diff --git a/src/qt/locale/nbx_da.ts b/src/qt/locale/nbx_da.ts
@@ -1653,12 +1653,6 @@ Vær tålmodig efter at du har klikket på import.</translation>
         <source>The user interface language can be set here. This setting will take effect after restarting Netbox.Wallet.</source>
         <translation>Vælg sprog her. Ændringerne træder i kraft næste gang Netbox.Wallet klienten startes</translation>
     </message>
-    <message>
-        <source>Language missing or translation incomplete? Help contributing translations here:
-https://www.transifex.com/pivx-project/pivx-project-translations</source>
-        <translation>Det valgte sprog mangler, eller oversættelsen er mangelfuld. Hjælp ved at bidrage med oversættelser her:
-https://www.transifex.com/pivx-project/pivx-project-translations</translation>
-    </message>
     <message>
         <source>Map port using &amp;UPnP</source>
         <translation>MAP port ved hjælp af UPnP</translation>

diff --git a/src/qt/locale/nbx_de.ts b/src/qt/locale/nbx_de.ts
@@ -1606,12 +1606,6 @@ Bitte haben Sie etwas Geduld, nachdem Sie auf Importieren geklickt haben.</trans
         <source>The user interface language can be set here. This setting will take effect after restarting Netbox.Wallet.</source>
         <translation>Die Sprache der Benutzeroberfläche kann hier festgelegt werden. Diese Einstellung wird nach einem Neustart realisiert.</translation>
     </message>
-    <message>
-        <source>Language missing or translation incomplete? Help contributing translations here:
-https://www.transifex.com/pivx-project/pivx-project-translations</source>
-        <translation>Sprache fehlt oder ist unvollständig? Helfe mit und trage zur Übersetzung bei unter:
-https://www.transifex.com/pivx-project/pivx-project-translations</translation>
-    </message>
     <message>
         <source>Map port using &amp;UPnP</source>
         <translation>Port mit &amp;UPnP mappen</translation>

diff --git a/src/qt/locale/nbx_en.ts b/src/qt/locale/nbx_en.ts
@@ -2155,12 +2155,6 @@ Please be patient after clicking import.</source>
         <source>The user interface language can be set here. This setting will take effect after restarting Netbox.Wallet.</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <location line="+21"/>
-        <source>Language missing or translation incomplete? Help contributing translations here:
-https://www.transifex.com/pivx-project/pivx-project-translations</source>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
         <location line="-204"/>
         <source>Map port using &amp;UPnP</source>

diff --git a/src/qt/locale/nbx_en_GB.ts b/src/qt/locale/nbx_en_GB.ts
@@ -1709,12 +1709,6 @@ Please be patient after clicking import.</translation>
         <source>The user interface language can be set here. This setting will take effect after restarting Netbox.Wallet.</source>
         <translation>The user interface language can be set here. This setting will take effect after restarting Netbox.Wallet.</translation>
     </message>
-    <message>
-        <source>Language missing or translation incomplete? Help contributing translations here:
-https://www.transifex.com/pivx-project/pivx-project-translations</source>
-        <translation>Language missing or translation incomplete? Help contributing translations here:
-https://www.transifex.com/pivx-project/pivx-project-translations</translation>
-    </message>
     <message>
         <source>Map port using &amp;UPnP</source>
         <translation>Map port using &amp;UPnP</translation>

diff --git a/src/qt/locale/nbx_en_US.ts b/src/qt/locale/nbx_en_US.ts
@@ -1451,12 +1451,6 @@ Please check the address and try again.</translation>
         <source>The user interface language can be set here. This setting will take effect after restarting Netbox.Wallet.</source>
         <translation>The user interface language can be set here. This setting will take effect after restarting Netbox.Wallet.</translation>
     </message>
-    <message>
-        <source>Language missing or translation incomplete? Help contributing translations here:
-https://www.transifex.com/pivx-project/pivx-project-translations</source>
-        <translation>Language missing or translation incomplete? Help contributing translations here:
-https://www.transifex.com/pivx-project/pivx-project-translations</translation>
-    </message>
     <message>
         <source>Map port using &amp;UPnP</source>
         <translation>Map port using &amp;UPnP</translation>

diff --git a/src/qt/locale/nbx_eo.ts b/src/qt/locale/nbx_eo.ts
@@ -1425,12 +1425,6 @@ Muktisendi: %1</translation>
         <source>The user interface language can be set here. This setting will take effect after restarting Netbox.Wallet.</source>
         <translation>La uzanta interfaco lingvo povas esti agordi ĉi tie. Tio agordo efektivigos post rekomenci Netbox.Wallet.</translation>
     </message>
-    <message>
-        <source>Language missing or translation incomplete? Help contributing translations here:
-https://www.transifex.com/pivx-project/pivx-project-translations</source>
-        <translation>Ĉu mankas lingvon aŭ nekompleta tradukado? Helpu la  tradukcio ĉi tie:
-https://www.transifex.com/pivx-project/pivx-project-translations</translation>
-    </message>
     <message>
         <source>Connect to the NBX network through a SOCKS5 proxy.</source>
         <translation>Konekti al la NBX reto per SOCKS5 prokurilo.</translation>

diff --git a/src/qt/locale/nbx_es.ts b/src/qt/locale/nbx_es.ts
@@ -1673,12 +1673,6 @@ Por favor, tenga paciencia después de hacer clic en importar.</translation>
         <source>The user interface language can be set here. This setting will take effect after restarting Netbox.Wallet.</source>
         <translation>El idioma de interface de usuario puede seleccionarse aquí. Este ajuste tomará efecto después de reiniciar Netbox.Wallet.</translation>
     </message>
-    <message>
-        <source>Language missing or translation incomplete? Help contributing translations here:
-https://www.transifex.com/pivx-project/pivx-project-translations</source>
-        <translation>¿Falta su lenguaje o la traducción está incompleta? Contribuya con las traducciones aquí:
-https://www.transifex.com/pivx-project/pivx-project-translations</translation>
-    </message>
     <message>
         <source>Map port using &amp;UPnP</source>
         <translation>Mapear un puerto utilizando &amp;UPnP</translation>

diff --git a/src/qt/locale/nbx_fr_FR.ts b/src/qt/locale/nbx_fr_FR.ts
@@ -1681,12 +1681,6 @@ S'il vous plaît soyez patient après avoir cliqué sur l'importation.</translat
         <source>The user interface language can be set here. This setting will take effect after restarting Netbox.Wallet.</source>
         <translation>La langue de l'interface utilisateur peut être définie ici. Ce paramètre prendra effet après le redémarrage de Netbox.Wallet.</translation>
     </message>
-    <message>
-        <source>Language missing or translation incomplete? Help contributing translations here:
-https://www.transifex.com/pivx-project/pivx-project-translations</source>
-        <translation>Langue manquante ou traduction incomplète? Aidez-nous à traduire ce projet ici:
-https://www.transifex.com/pivx-project/pivx-project-translations</translation>
-    </message>
     <message>
         <source>Map port using &amp;UPnP</source>
         <translation>Répertorier les port utilisant UPnP</translation>

diff --git a/src/qt/locale/nbx_hr_HR.ts b/src/qt/locale/nbx_hr_HR.ts
@@ -1613,12 +1613,6 @@ Budite strpljivi nakon što kliknete uvoz.</translation>
         <source>The user interface language can be set here. This setting will take effect after restarting Netbox.Wallet.</source>
         <translation>Ovdje se može postaviti jezik korisničkog sučelja. Ova postavka će stupiti na snagu nakon ponovnog pokretanja Netbox.Wallet-a.</translation>
     </message>
-    <message>
-        <source>Language missing or translation incomplete? Help contributing translations here:
-https://www.transifex.com/pivx-project/pivx-project-translations</source>
-        <translation>Jezik nedostaje ili prijevod nije potpun? Pomozite s prijevodima ovdje:
-https://www.transifex.com/pivx-project/pivx-project-translations</translation>
-    </message>
     <message>
         <source>Map port using &amp;UPnP</source>
         <translation>Karte porta pomoću UPnP</translation>

diff --git a/src/qt/locale/nbx_ko_KR.ts b/src/qt/locale/nbx_ko_KR.ts
@@ -1611,12 +1611,6 @@ Please be patient after clicking import.</source>
         <source>The user interface language can be set here. This setting will take effect after restarting Netbox.Wallet.</source>
         <translation>사용자 인터페이스 언어를 설정할 수 있습니다. 이 설정은 Netbox.Wallet을 다시 시작한 후에 적용됩니다.</translation>
     </message>
-    <message>
-        <source>Language missing or translation incomplete? Help contributing translations here:
-https://www.transifex.com/pivx-project/pivx-project-translations</source>
-        <translation>지원 언어가 없거나 번역이 불완전한가요? 번역을 도와주세요 :
-https://www.transifex.com/pivx-project/pivx-project-translations</translation>
-    </message>
     <message>
         <source>Map port using &amp;UPnP</source>
         <translation>&amp;UPnp를 사용하여 포트 매핑</translation>

diff --git a/src/qt/locale/nbx_lt_LT.ts b/src/qt/locale/nbx_lt_LT.ts
@@ -1559,12 +1559,6 @@ MultiSend nebus aktyvuotas, nebent paspausite "Įjungti"</translation>
         <source>The user interface language can be set here. This setting will take effect after restarting Netbox.Wallet.</source>
         <translation>Čia galite nustatyti vartotojo sąsajos kalbą. Šis nustatymas įsigalios iš naujo paleidus Netbox.Wallet.</translation>
     </message>
-    <message>
-        <source>Language missing or translation incomplete? Help contributing translations here:
-https://www.transifex.com/pivx-project/pivx-project-translations</source>
-        <translation>Trūksta kalbos arba vertimas nebaigtas? Padėkite prisidėdami prie vertimų čia: 
-https://www.transifex.com/pivx-project/pivx-project-translations</translation>
-    </message>
     <message>
         <source>Map port using &amp;UPnP</source>
         <translation>Įrašyti prievadą naudojant &amp;UPnP</translation>

diff --git a/src/qt/locale/nbx_nl.ts b/src/qt/locale/nbx_nl.ts
@@ -1701,12 +1701,6 @@ Waas alsjeblieft geduldig nadat u op importeren hebt geklikt.</translation>
         <source>The user interface language can be set here. This setting will take effect after restarting Netbox.Wallet.</source>
         <translation>De gebruikersinterface taal kan hier ingesteld worden. Deze instelling zal uitgevoerd na herstart van Netbox.Wallet.</translation>
     </message>
-    <message>
-        <source>Language missing or translation incomplete? Help contributing translations here:
-https://www.transifex.com/pivx-project/pivx-project-translations</source>
-        <translation>Taal ontbreekt of vertaling onvolledig? Help om bij te dragen aan vertalingen:
-https://www.transifex.com/pivx-project/pivx-project-translations</translation>
-    </message>
     <message>
         <source>Map port using &amp;UPnP</source>
         <translation>Map poort gebruikt &amp;UPnP</translation>

diff --git a/src/qt/locale/nbx_pl.ts b/src/qt/locale/nbx_pl.ts
@@ -1710,12 +1710,6 @@ Please be patient after clicking import.</source>
         <source>The user interface language can be set here. This setting will take effect after restarting Netbox.Wallet.</source>
         <translation>Język interfejsu użytkownika może być wybrany tutaj. Ustawienia ulegną zmianie po restarcie Netbox.Wallet</translation>
     </message>
-    <message>
-        <source>Language missing or translation incomplete? Help contributing translations here:
-https://www.transifex.com/pivx-project/pivx-project-translations</source>
-        <translation>Brakuje języka bądź nieukończona pełnego tłumaczenia? Pomóż w tłumaczeniu tutaj:
-https://www.transifex.com/pivx-project/pivx-project-translations </translation>
-    </message>
     <message>
         <source>Map port using &amp;UPnP</source>
         <translation>Mapuj port za pomocą &amp;UPnP</translation>

diff --git a/src/qt/locale/nbx_pt_BR.ts b/src/qt/locale/nbx_pt_BR.ts
@@ -1446,12 +1446,6 @@ MultiSend: %1</translation>
         <source>The user interface language can be set here. This setting will take effect after restarting Netbox.Wallet.</source>
         <translation>A linguagem da interface pode ser definida aqui. Está configuração terá efeito após reinício do Netbox.Wallet.</translation>
     </message>
-    <message>
-        <source>Language missing or translation incomplete? Help contributing translations here:
-https://www.transifex.com/pivx-project/pivx-project-translations</source>
-        <translation>Linguagem não encontrada ou tradução incompleta? Ajude contribuido com traduções aqui:
-https://www.transifex.com/pivx-project/pivx-project-translations</translation>
-    </message>
     <message>
         <source>Connect to the NBX network through a SOCKS5 proxy.</source>
         <translation>Conectar à rede NBX através de um proxy SOCKS5</translation>

diff --git a/src/qt/locale/nbx_ru.ts b/src/qt/locale/nbx_ru.ts
@@ -1611,12 +1611,6 @@ Please be patient after clicking import.</source>
         <source>The user interface language can be set here. This setting will take effect after restarting Netbox.Wallet.</source>
         <translation>Здесь можно выставить язык интерфейса. Изменения вступят в силу после перезапуска Netbox.Wallet.</translation>
     </message>
-    <message>
-        <source>Language missing or translation incomplete? Help contributing translations here:
-https://www.transifex.com/pivx-project/pivx-project-translations</source>
-        <translation>Отсутствует ваш язык или заметили незавершенный перевод? Вы можете помочь нам стать лучше:
-https://www.transifex.com/pivx-project/pivx-project-translations</translation>
-    </message>
     <message>
         <source>Map port using &amp;UPnP</source>
         <translation>Карта порта, использующего &amp;UPnP</translation>