Several fixes

CMakeLists.txt

@@ -1,3 +1,4 @@
+# Copyright (c) 2018, The Scala Project
 # Copyright (c) 2014-2019, The Monero Project
 #
 # All rights reserved.
@@ -106,6 +107,10 @@ if(NOT CMAKE_BUILD_TYPE)
 endif()
 string(TOLOWER ${CMAKE_BUILD_TYPE} CMAKE_BUILD_TYPE_LOWER)
 
+# On Darwin, ensure the user-defined paths are used to find PCSC
+# before falling back to the system frameworks.
+set(CMAKE_FIND_FRAMEWORK "LAST")
+
 # ARCH defines the target architecture, either by an explicit identifier or
 # one of the following two keywords. By default, ARCH a value of 'native':
 # target arch = host arch, binary is not portable. When ARCH is set to the

src/blockchain_utilities/blockchain_utilities.h

@@ -33,7 +33,7 @@
 
 // bounds checking is done before writing to buffer, but buffer size
 // should be a sensible maximum
-#define BUFFER_SIZE 1100000
+#define BUFFER_SIZE 1400000
 #define CHUNK_SIZE_WARNING_THRESHOLD 600000
 #define NUM_BLOCKS_PER_CHUNK 1
 #define BLOCKCHAIN_RAW "blockchain.raw"

src/checkpoints/checkpoints.cpp

@@ -230,6 +230,11 @@ namespace cryptonote
     ADD_CHECKPOINT(566200,"0fa4b56537d191932854fb2faf5fdd53931c0eb384e65abd7d0ec96accb721fe");
     ADD_CHECKPOINT(567222,"57a3acfc3c9ba353731cb3a3266e0de89d8ed0f700ae6d407d1481738a8d315a");
     ADD_CHECKPOINT(567507,"e385c6d652678a8f65dec43e95e0690fb6dd916c8913f048854e78c8d41d547c");
+    ADD_CHECKPOINT(573299,"53b24d306283ac1cf3bc7990588d0bc9163d18fd49945c76fb8d833043af461f");
+    ADD_CHECKPOINT(573454,"32f8fc33f88f8c9d65d3eda4b4f8b76ddd435e0bb32e62271014ea002e792d5e");
+    ADD_CHECKPOINT(577775,"19b910637cd817359d594287b502a3aab41f63ec9a83911315e9f7e2a1382adc");	
+    ADD_CHECKPOINT(597372,"955342bed7e1c3890262b0247b5a2411932dbb8cd5171fad3095469252e493fa");
+    ADD_CHECKPOINT(599400,"9bb7d1f0fba3275776595ecf0bedfaa262f59864df7d002ecb99a70b941ed15a");
     return true;
   }
 

src/cryptonote_basic/connection_context.h

@@ -31,16 +31,18 @@
 #pragma once
 #include <unordered_set>
 #include <atomic>
+#include <boost/date_time/posix_time/posix_time.hpp>
 #include "net/net_utils_base.h"
 #include "copyable_atomic.h"
+#include "crypto/hash.h"
 
 namespace cryptonote
 {
 
   struct cryptonote_connection_context: public epee::net_utils::connection_context_base
   {
-    cryptonote_connection_context(): m_state(state_before_handshake), m_remote_blockchain_height(0), m_last_response_height(0),
-        m_last_request_time(boost::date_time::not_a_date_time), m_callback_request_count(0),
+    cryptonote_connection_context(): m_state(state_before_handshake), m_original_remote_blockchain_height(0), m_remote_blockchain_height(0), m_last_response_height(0),
+        m_connection_time(boost::date_time::not_a_date_time), m_last_request_time(boost::date_time::not_a_date_time), m_callback_request_count(0),
         m_last_known_hash(crypto::null_hash), m_pruning_seed(0), m_rpc_port(0), m_anchor(false) {}
 
     enum state
@@ -55,8 +57,10 @@ namespace cryptonote
     state m_state;
     std::vector<crypto::hash> m_needed_objects;
     std::unordered_set<crypto::hash> m_requested_objects;
+    uint64_t m_original_remote_blockchain_height;
     uint64_t m_remote_blockchain_height;
     uint64_t m_last_response_height;
+    boost::posix_time::ptime m_connection_time;
     boost::posix_time::ptime m_last_request_time;
     epee::copyable_atomic m_callback_request_count; //in debug purpose: problem with double callback rise
     crypto::hash m_last_known_hash;

src/version.cpp.in

@@ -1,5 +1,5 @@
 #define DEF_SCALA_VERSION_TAG "@VERSIONTAG@"
-#define DEF_SCALA_VERSION "3.0.0.3"
+#define DEF_SCALA_VERSION "3.0.0.4"
 #define DEF_SCALA_RELEASE_NAME "Himalaya"
 #define DEF_SCALA_VERSION_FULL DEF_SCALA_VERSION "-" DEF_SCALA_VERSION_TAG