Merge pull request #425

79c95c1 simplewallet: bump default mixin from 3 to 4 (moneromooo-monero)
ac90d48 from hard fork 2, all outputs must be decomposed (moneromooo-monero)
90ccad1 from hard fork 2, claim a quantized reward in coinbase (moneromooo-monero)
22b1570 cryptonote_format_utils: add a function to tell if an amount is canonical (moneromooo-monero)

1 files changed, 6 insertions, 0 deletions

diff --git a/src/cryptonote_core/tx_pool.cpp b/src/cryptonote_core/tx_pool.cpp
index 12fd3fe62..dce64db99 100644
--- a/src/cryptonote_core/tx_pool.cpp
+++ b/src/cryptonote_core/tx_pool.cpp
@@ -125,6 +125,12 @@ namespace cryptonote
       }
     }
 
+    if (!m_blockchain.check_tx_outputs(tx))
+    {
+      LOG_PRINT_L1("Transaction with id= "<< id << " has at least one invalid outout");
+      tvc.m_verifivation_failed = true;
+      return false;
+    }
 
     crypto::hash max_used_block_id = null_hash;
     uint64_t max_used_block_height = 0;