Merge pull request #1930

d1530f06 update version to 0.10.3.1 tag (Riccardo Spagni)

src/cryptonote_basic/cryptonote_format_utils.cpp

@@ -658,6 +658,8 @@ namespace cryptonote
   //---------------------------------------------------------------
   bool get_transaction_hash(const transaction& t, crypto::hash& res, size_t* blob_size)
   {
+    return calculate_transaction_hash(t, res, blob_size);
+#if 0
     if (t.is_hash_valid())
     {
 #ifdef ENABLE_HASH_CASH_INTEGRITY_CHECK
@@ -688,6 +690,7 @@ namespace cryptonote
       t.set_blob_size_valid(true);
     }
     return true;
+#endif
   }
   //---------------------------------------------------------------
   bool get_transaction_hash(const transaction& t, crypto::hash& res, size_t& blob_size)
@@ -733,6 +736,8 @@ namespace cryptonote
   //---------------------------------------------------------------
   bool get_block_hash(const block& b, crypto::hash& res)
   {
+    return calculate_block_hash(b, res);
+#if 0
     if (b.is_hash_valid())
     {
 #ifdef ENABLE_HASH_CASH_INTEGRITY_CHECK
@@ -749,6 +754,7 @@ namespace cryptonote
     b.hash = res;
     b.set_hash_valid(true);
     return true;
+#endif
   }
   //---------------------------------------------------------------
   crypto::hash get_block_hash(const block& b)

src/version.h.in

@@ -1,4 +1,4 @@
 #define MONERO_VERSION_TAG "@VERSIONTAG@"
-#define MONERO_VERSION "0.10.3.0"
+#define MONERO_VERSION "0.10.3.1"
 #define MONERO_RELEASE_NAME "Wolfram Warptangent"
 #define MONERO_VERSION_FULL MONERO_VERSION "-" MONERO_VERSION_TAG