Merge branch 'release'

hyle-team · Oct 8, 2019 · 26c00a8 · 26c00a8
2 parents 40ba8cd + 316ae9d
commit 26c00a8
Show file tree

Hide file tree

Showing 45 changed files with 1,227 additions and 928 deletions.
diff --git a/contrib/epee/include/misc_log_ex.h b/contrib/epee/include/misc_log_ex.h
@@ -45,6 +45,7 @@
 #include <boost/cstdint.hpp>
 #include <boost/thread.hpp>
 #include <boost/filesystem.hpp>
+#include <boost/filesystem/fstream.hpp>
 #include <boost/algorithm/string.hpp>
 #endif
 #if defined(WIN32)

diff --git a/src/common/command_line.cpp b/src/common/command_line.cpp
@@ -29,5 +29,5 @@ namespace command_line
 
   const arg_descriptor<bool>        arg_disable_stop_if_time_out_of_sync = { "disable-stop-if-time-out-of-sync", "Do not stop the daemon if serious time synchronization problem is detected", false, true };
   const arg_descriptor<bool>        arg_disable_stop_on_low_free_space   = { "disable-stop-on-low-free-space", "Do not stop the daemon if free space at data dir is critically low", false, true };
-  const arg_descriptor<bool>        arg_enable_offers_service = { "enable_offers_service", "Enables marketplace feature", false, false};
+  const arg_descriptor<bool>        arg_enable_offers_service = { "enable-offers-service", "Enables marketplace feature", false, false};
 }
diff --git a/src/currency_core/blockchain_storage.cpp b/src/currency_core/blockchain_storage.cpp
@@ -363,13 +363,16 @@ bool blockchain_storage::init(const std::string& config_folder, const boost::pro
 //------------------------------------------------------------------
 bool blockchain_storage::set_lost_tx_unmixable_for_height(uint64_t height)
 {
+#ifndef TESTNET
   if (height == 75738)
     return set_lost_tx_unmixable();  
+#endif
   return true;
 }
 //------------------------------------------------------------------
 bool blockchain_storage::set_lost_tx_unmixable()
 {  
+#ifndef TESTNET
   if (m_db_blocks.size() > 75738)
   {
      crypto::hash tx_id_1 = epee::string_tools::parse_tpod_from_hex_string<crypto::hash>("c2a2229d614e7c026433efbcfdbd0be1f68d9b419220336df3e2c209f5d57314");
@@ -393,11 +396,13 @@ bool blockchain_storage::set_lost_tx_unmixable()
      }
      m_db_transactions.set(tx_id_2, tx2_local_entry);
   }
+#endif
   return true;
 }
 //------------------------------------------------------------------
 void  blockchain_storage::patch_out_if_needed(txout_to_key& out, const crypto::hash& tx_id, uint64_t n) const 
 {
+#ifndef TESTNET
   static crypto::hash tx_id_1 = epee::string_tools::parse_tpod_from_hex_string<crypto::hash>("c2a2229d614e7c026433efbcfdbd0be1f68d9b419220336df3e2c209f5d57314");
   static crypto::hash tx_id_2 = epee::string_tools::parse_tpod_from_hex_string<crypto::hash>("647f936c6ffbd136f5c95d9a90ad554bdb4c01541c6eb5755ad40b984d80da67");
 
@@ -408,6 +413,7 @@ void  blockchain_storage::patch_out_if_needed(txout_to_key& out, const crypto::h
   {
     out.mix_attr = CURRENCY_TO_KEY_OUT_FORCED_NO_MIX;
   }
+#endif
 }
 //------------------------------------------------------------------
 void blockchain_storage::store_db_solo_options_values()

diff --git a/src/currency_core/offers_service_basics.h b/src/currency_core/offers_service_basics.h
@@ -19,7 +19,7 @@ namespace bc_services
   {
 
     //fields filled in UI
-    uint8_t offer_type;             // OFFER_TYPE_PRIMARY_TO_TARGET - 0, OFFER_TYPE_TARGET_TO_PRIMARY - 1 etc.
+    uint8_t offer_type;             // OFFER_TYPE_PRIMARY_TO_TARGET(SELL ORDER) - 0, OFFER_TYPE_TARGET_TO_PRIMARY(BUY ORDER) - 1 etc.
     uint64_t amount_primary;        // amount of the currency
     uint64_t amount_target;         // amount of other currency or goods
     std::string bonus;              //

diff --git a/src/gui/qt-daemon/html/assets/i18n/de.json b/src/gui/qt-daemon/html/assets/i18n/de.json
@@ -46,7 +46,7 @@
       "ONLINE": "Online",
       "ERROR": "Systemfehler",
       "COMPLETE": "Abschluss",
-      "SYNCING": "Synchronisiere Blockchain",
+      "SYNCING": "Syncing block",
       "LOADING": "Lade Blockchain-Daten"
     },
     "UPDATE": {

diff --git a/src/gui/qt-daemon/html/assets/i18n/en.json b/src/gui/qt-daemon/html/assets/i18n/en.json
@@ -150,8 +150,14 @@
       "TIME3": "1 hour",
       "TIME4": "Never"
     },
+    "SCALE": {
+      "75": "75% scale", 
+      "100": "100% scale",
+      "125": "125% scale",
+      "150": "150% scale"
+    },
     "LANGUAGE": {
-      "TITLE": "Languages",
+      "TITLE": "Language",
       "EN": "English",
       "FR": "French",
       "DE": "Deutsch",
@@ -180,7 +186,10 @@
     "AVAILABLE_BALANCE": "Available <b>{{available}} {{currency}}<b/>",
     "LOCKED_BALANCE": "Locked <b>{{locked}} {{currency}}<b/>",
     "LOCKED_BALANCE_LINK": "What does that mean?",
-    "CLOSE_MESSAGE": "<span class=\"message\">Remove wallet from the list</span> <br> <span>(To access it you’ll have to add it again)</span>",
+    "CONFIRM": {
+      "TITLE": "Remove wallet from the list?",
+      "MESSAGE": "To access it you’ll have to add it again"
+    },
     "TABS": {
       "SEND": "Send",
       "RECEIVE": "Receive",

diff --git a/src/gui/qt-daemon/html/assets/i18n/fr.json b/src/gui/qt-daemon/html/assets/i18n/fr.json
@@ -46,7 +46,7 @@
       "ONLINE": "En ligne",
       "ERROR": "Erreur de système",
       "COMPLETE": "Fermeture",
-      "SYNCING": "Synchronisation de la blockchain",
+      "SYNCING": "Syncing block",
       "LOADING": "Chargement des données de la blockchain"
     },
     "UPDATE": {

diff --git a/src/gui/qt-daemon/html/assets/i18n/it.json b/src/gui/qt-daemon/html/assets/i18n/it.json
@@ -46,7 +46,7 @@
       "ONLINE": "Online",
       "ERROR": "Errore di sistema",
       "COMPLETE": "Completata",
-      "SYNCING": "Sincronizzazione blockchain",
+      "SYNCING": "Syncing block",
       "LOADING": "Caricamento dati blockchain"
     },
     "UPDATE": {