Merge branch 'release'

contrib/epee/include/storages/levin_abstract_invoke2.h

@@ -126,7 +126,8 @@ namespace epee
         t_result result_struct = AUTO_VAL_INIT(result_struct);
         if( code <=0 )
         {
-          LOG_PRINT_L1("Failed to invoke command " << command << " return code " << code << "(" << epee::levin::get_err_descr(code) << ")");
+          LOG_PRINT_L2("BACKTRACE: " << ENDL << epee::misc_utils::print_trace());
+          LOG_PRINT_L1("Failed to invoke command " << command << " return code " << code << "(" << epee::levin::get_err_descr(code) << ")context:" << print_connection_context(context));
           TRY_ENTRY()
           cb(code, result_struct, context);
           CATCH_ENTRY2(true)
@@ -149,7 +150,8 @@ namespace epee
       }, inv_timeout);
       if( res <=0 )
       {
-        LOG_PRINT_L1("Failed to invoke command " << command << " return code " << res << "(" << epee::levin::get_err_descr(res)<< ")");
+        LOG_PRINT_L2("BACKTRACE: " << ENDL << epee::misc_utils::print_trace());
+        LOG_PRINT_L1("Failed to invoke command " << command << " return code " << res << "(" << epee::levin::get_err_descr(res) << ") conn_id=" << conn_id);
         return false;
       }
       return true;

src/common/db_backend_lmdb.cpp

@@ -108,8 +108,12 @@ namespace tools
         transactions_list& rtxlist = m_txs[std::this_thread::get_id()];
         MDB_txn* pparent_tx = nullptr;
         MDB_txn* p_new_tx = nullptr;
+        bool parent_read_only = false;
         if (rtxlist.size())
+        {
           pparent_tx = rtxlist.back().ptx;
+          parent_read_only = rtxlist.back().read_only;
+        }
 
 
         if (pparent_tx && read_only)
@@ -123,6 +127,11 @@ namespace tools
           if (read_only)
             flags += MDB_RDONLY;
 
+          //don't use parent tx in write transactions if parent tx was read-only (restriction in lmdb) 
+          //see "Nested transactions: Max 1 child, write txns only, no writemap"
+          if (pparent_tx && parent_read_only)
+            pparent_tx = nullptr;
+
           CHECK_AND_ASSERT_THROW_MES(m_penv, "m_penv==null, db closed");
           res = mdb_txn_begin(m_penv, pparent_tx, flags, &p_new_tx);
           CHECK_AND_ASSERT_MESS_LMDB_DB(res, false, "Unable to mdb_txn_begin");

src/gui/qt-daemon/html/main.js

@@ -6424,7 +6424,7 @@ var SidebarComponent = /** @class */ (function () {
         });
     };
     SidebarComponent.prototype.getUpdate = function () {
-        this.backend.openUrlInBrowser('docs.zano.org/docs/zano-wallet');
+        this.backend.openUrlInBrowser('zano.org/downloads.html');
     };
     SidebarComponent.prototype.logOut = function () {
         var _this = this;

src/stratum/stratum_server.cpp

@@ -36,7 +36,7 @@ namespace
 #define VDIFF_TARGET_MAX_DEFAULT 100000000000ull // = 100 Gh
 #define VDIFF_TARGET_TIME_DEFAULT 30 // sec
 #define VDIFF_RETARGET_TIME_DEFAULT 240 // sec
-#define VDIFF_RETARGET_SHARES_COUNT 12 // enforce retargeting if this many shares are be received (huge performace comparing to current difficulty)
+#define VDIFF_RETARGET_SHARES_COUNT 12 // enforce retargeting if this many shares are received (high performace in terms of current difficulty)
 #define VDIFF_VARIANCE_PERCENT_DEFAULT 25 // %
 
   const command_line::arg_descriptor<bool>        arg_stratum               = {"stratum",                   "Stratum server: enable" };
@@ -57,7 +57,7 @@ namespace
   const command_line::arg_descriptor<uint64_t>    arg_stratum_vdiff_retarget_time = {"stratum-vdiff-retarget-time",  "Stratum server: check to see if we should retarget this often (sec.)",  VDIFF_RETARGET_TIME_DEFAULT };
   const command_line::arg_descriptor<uint64_t>    arg_stratum_vdiff_retarget_shares = {"stratum-vdiff-retarget-shares",  "Stratum server: enforce retargeting if got this many shares",  VDIFF_RETARGET_SHARES_COUNT };
   const command_line::arg_descriptor<uint64_t>    arg_stratum_vdiff_variance_percent  = {"stratum-vdiff-variance-percent",  "Stratum server: allow average time to very this % from target without retarget",  VDIFF_VARIANCE_PERCENT_DEFAULT };
-  const command_line::arg_descriptor<bool>        arg_stratum_always_online = { "stratum-always-online",                   "Stratum server consider core as always online, useful for debugging with --offline-mode" };
+  const command_line::arg_descriptor<bool>        arg_stratum_always_online = { "stratum-always-online",                   "Stratum server consider the core being synchronized regardless of online status, useful for debugging with --offline-mode" };
 
 //==============================================================================================================================
 
@@ -80,7 +80,7 @@ namespace
 #define HR_TO_STREAM_IN_MHS_3P(hr) std::fixed << std::setprecision(3) << hr / 1000000.0
 
 // debug stuff
-#define DBG_NETWORK_DIFFICULTY 0 // if non-zero: use this value as net difficulty when checking shares (useful for debugging on testnet, recommended value is 160000000000ull)
+#define DBG_NETWORK_DIFFICULTY 0 // if non-zero: use this value as net difficulty when checking shares (useful for debugging on testnet, recommended value is 1600000000ull)
 #define DBG_CORE_ALWAYS_SYNCRONIZED 0 // if set to 1: allows the server to start even if the core is not syncronized, useful for debugging with --offline-mode
 #define STRINGIZE_DETAIL(x) #x
 #define STRINGIZE(x) STRINGIZE_DETAIL(x)

src/version.h.in

@@ -2,6 +2,6 @@
 
 #define BUILD_COMMIT_ID "@VERSION@"
 #define PROJECT_VERSION "1.0"
-#define PROJECT_VERSION_BUILD_NO 38
+#define PROJECT_VERSION_BUILD_NO 39
 #define PROJECT_VERSION_BUILD_NO_STR STRINGIFY_EXPAND(PROJECT_VERSION_BUILD_NO)
 #define PROJECT_VERSION_LONG PROJECT_VERSION "." PROJECT_VERSION_BUILD_NO_STR "[" BUILD_COMMIT_ID "]"

utils/update_alert.json

@@ -2,10 +2,10 @@
    "maj":1,
    "min":0,
    "rev":0,
-   "build":26,
+   "build":37,
    "cs":[
       {
-         "build":28,
+         "build":37,
          "mode":3
       }
    ]