Merge pull request monero-project#5 from amphibia/BMR_mm_spend_fix

Fix for non-spendable merged mining reward
mathstuf · May 13, 2014 · 10e33eb · 10e33eb
2 parents 00689dc + 8c95456
commit 10e33eb
Showing 1 changed file with 1 addition and 2 deletions.
diff --git a/src/cryptonote_core/cryptonote_format_utils.cpp b/src/cryptonote_core/cryptonote_format_utils.cpp
@@ -239,8 +239,7 @@ namespace cryptonote
   crypto::public_key get_tx_pub_key_from_extra(const std::vector<uint8_t>& tx_extra)
   {
     std::vector<tx_extra_field> tx_extra_fields;
-    if (!parse_tx_extra(tx_extra, tx_extra_fields))
-      return null_pkey;
+    parse_tx_extra(tx_extra, tx_extra_fields);
 
     tx_extra_pub_key pub_key_field;
     if(!find_tx_extra_field_by_type(tx_extra_fields, pub_key_field))