add leeway_deadline_exception #2898

libraries/chain/controller.cpp

@@ -436,7 +436,8 @@ struct controller_impl {
       auto code = e.code();
       return (code == block_net_usage_exceeded::code_value) ||
              (code == block_cpu_usage_exceeded::code_value) ||
-             (code == deadline_exception::code_value);
+             (code == deadline_exception::code_value)       ||
+             (code == leeway_deadline_exception::code_value);
    }
 
    transaction_trace_ptr push_scheduled_transaction( const transaction_id_type& trxid, fc::time_point deadline, uint32_t billed_cpu_time_us ) {

libraries/chain/include/eosio/chain/exceptions.hpp

@@ -211,8 +211,8 @@ namespace eosio { namespace chain {
                                     3080005, "transaction CPU usage is too much for the remaining allowable usage of the current block" )
       FC_DECLARE_DERIVED_EXCEPTION( deadline_exception, resource_exhausted_exception,
                                     3080006, "transaction took too long" )
-      FC_DECLARE_DERIVED_EXCEPTION( action_cpu_usage_exceeded, resource_exhausted_exception,
-                                    3080007, "action took too long" )
+      FC_DECLARE_DERIVED_EXCEPTION( leeway_deadline_exception, deadline_exception,
+                                    3081001, "transaction reached the deadline set due to leeway on account CPU limits" )
 
    FC_DECLARE_DERIVED_EXCEPTION( authorization_exception, chain_exception,
                                  3090000, "Authorization exception" )

libraries/chain/transaction_context.cpp

@@ -113,8 +113,7 @@ namespace eosio { namespace chain {
       // Possibly limit deadline if the duration accounts can be billed for (+ a subjective leeway) does not exceed current delta
       if( ( fc::microseconds(account_cpu_limit) + leeway ) <= (deadline - start) ) {
          deadline = start + fc::microseconds(account_cpu_limit) + leeway;
-         if( deadline_exception_code != tx_cpu_usage_exceeded::code_value )
-            deadline_exception_code = deadline_exception::code_value;
+         deadline_exception_code = leeway_deadline_exception::code_value;
       }
 
       eager_net_limit = (eager_net_limit/8)*8; // Round down to nearest multiple of word size (8 bytes) so check_net_usage can be efficient
@@ -289,6 +288,11 @@ namespace eosio { namespace chain {
             EOS_THROW( tx_cpu_usage_exceeded,
                        "transaction was executing for too long",
                        ("now", now)("deadline", deadline)("start", start) );
+         } else if( deadline_exception_code == leeway_deadline_exception::code_value ) {
+            EOS_THROW( leeway_deadline_exception,
+                       "the transaction was unable to complete by deadline, "
+                       "but it is possible it could have succeeded if it were allow to run to completion",
+                       ("now", now)("deadline", deadline)("start", start) );
          }
          FC_ASSERT( false, "unexpected deadline exception code" );
       }
@@ -330,9 +334,6 @@ namespace eosio { namespace chain {
 
       try {
          acontext.exec();
-      } catch( const action_cpu_usage_exceeded& e ) {
-         trace = move(acontext.trace);
-         FC_ASSERT(false, "should not have reached here" );
       } catch( ... ) {
          trace = move(acontext.trace);
          throw;

plugins/producer_plugin/producer_plugin.cpp

@@ -47,7 +47,8 @@ namespace {
       auto code = e.code();
       return (code == block_cpu_usage_exceeded::code_value) ||
              (code == block_net_usage_exceeded::code_value) ||
-             (code == deadline_exception::code_value && deadline_is_subjective);
+             (code == deadline_exception::code_value && deadline_is_subjective) ||
+             (code == leeway_deadline_exception::code_value && deadline_is_subjective);
    }
 }
 

unittests/CMakeLists.txt

@@ -33,9 +33,11 @@ add_dependencies(unit_test asserter test_api test_api_mem test_api_db test_api_m
 #To run unit_test with all log from blockchain displayed, put --verbose after --, i.e. unit_test -- --verbose
 add_test(NAME unit_test_binaryen COMMAND unit_test
  -t \!eosio_system_tests/*
+ -t \!wasm_tests/weighted_cpu_limit_tests
  --report_level=detailed --color_output -- --binaryen)
 add_test(NAME unit_test_wavm COMMAND unit_test
  -t \!eosio_system_tests/*
+ -t \!wasm_tests/weighted_cpu_limit_tests
  --report_level=detailed --color_output --catch_system_errors=no -- --wavm)
 
 if(ENABLE_COVERAGE_TESTING)

unittests/wasm_tests.cpp

@@ -633,8 +633,7 @@ BOOST_FIXTURE_TEST_CASE(weighted_cpu_limit_tests, tester ) try {
          BOOST_REQUIRE_EQUAL(true, chain_has_transaction(trx.id()));
          pass = true;
          count++;
-      } catch( eosio::chain::deadline_exception& ) {
-#warning It does not seem right to catch deadline_exception and yet the test passes. Need to investigate this.
+      } catch( eosio::chain::leeway_deadline_exception& ) {
          BOOST_REQUIRE_EQUAL(count, 3);
          break;
       }