Merge branch 'master' of https://github.com/EOSIO/eos

tmuskal · Jun 16, 2018 · c67af69 · c67af69
2 parents 9dc07d4 + c9b7a24
commit c67af69
Showing 1 changed file with 3 additions and 1 deletion.
diff --git a/libraries/chain/controller.cpp b/libraries/chain/controller.cpp
@@ -804,7 +804,9 @@ struct controller_impl {
                EOS_ASSERT( false, block_validate_exception, "encountered unexpected receipt type" );
             }
 
-            if( trace && trace->except ) {
+            bool transaction_failed =  trace && trace->except;
+            bool transaction_can_fail = receipt.status == transaction_receipt_header::hard_fail && receipt.trx.contains<transaction_id_type>();
+            if( transaction_failed && !transaction_can_fail) {
                edump((*trace));
                throw *trace->except;
             }