Merge branch 'slim' into issue2589

contracts/eosio.msig/eosio.msig.abi

@@ -31,7 +31,7 @@
          {"name": "ref_block_num", "type": "uint16"},
          {"name": "ref_block_prefix", "type": "uint32"},
          {"name": "max_net_usage_words", "type": "varuint32"},
-         {"name": "max_kcpu_usage", "type": "varuint32"},
+         {"name": "max_cpu_usage_ms", "type": "uint8"},
          {"name": "delay_sec", "type": "varuint32"}
       ]
    },{

contracts/eosiolib/transaction.hpp

@@ -32,10 +32,10 @@ namespace eosio {
       uint16_t        ref_block_num;
       uint32_t        ref_block_prefix;
       unsigned_int    net_usage_words = 0UL; /// number of 8 byte words this transaction can serialize into after compressions
-      unsigned_int    kcpu_usage = 0UL; /// number of CPU usage units to bill transaction for
+      uint8_t         max_cpu_usage_ms = 0UL; /// number of CPU usage units to bill transaction for
       unsigned_int    delay_sec = 0UL; /// number of CPU usage units to bill transaction for
 
-      EOSLIB_SERIALIZE( transaction_header, (expiration)(ref_block_num)(ref_block_prefix)(net_usage_words)(kcpu_usage)(delay_sec) )
+      EOSLIB_SERIALIZE( transaction_header, (expiration)(ref_block_num)(ref_block_prefix)(net_usage_words)(max_cpu_usage_ms)(delay_sec) )
    };
 
    class transaction : public transaction_header {

libraries/chain/apply_context.cpp

@@ -477,7 +477,6 @@ void apply_context::db_update_i64( int iterator, account_name payer, const char*
    }
 
    db.modify( obj, [&]( auto& o ) {
-     o.value.resize( 0 );
      o.value.resize( buffer_size );
      memcpy( o.value.data(), buffer, buffer_size );
      o.payer = payer;

libraries/chain/block_state.cpp

@@ -3,34 +3,6 @@
 
 namespace eosio { namespace chain {
 
-#if 0
-   /**
-    *  Perform context free validation of transaction state
-    */
-   void validate_transaction( const transaction& trx ) {
-      EOS_ASSERT( !trx.actions.empty(), tx_no_action, "transaction must have at least one action" );
-
-      // Check for at least one authorization in the context-aware actions
-      bool has_auth = false;
-      for( const auto& act : trx.actions ) {
-         has_auth |= !act.authorization.empty();
-         if( has_auth ) break;
-      }
-      EOS_ASSERT( has_auth, tx_no_auths, "transaction must have at least one authorization" );
-
-      // Check that there are no authorizations in any of the context-free actions
-      for (const auto &act : trx.context_free_actions) {
-         EOS_ASSERT( act.authorization.empty(), cfa_irrelevant_auth, 
-                     "context-free actions cannot require authorization" );
-      }
-
-      EOS_ASSERT( trx.max_kcpu_usage.value < UINT32_MAX / 1024UL, transaction_exception, "declared max_kcpu_usage overflows when expanded to max cpu usage" );
-      EOS_ASSERT( trx.max_net_usage_words.value < UINT32_MAX / 8UL, transaction_exception, "declared max_net_usage_words overflows when expanded to max net usage" );
-   } /// validate_transaction
-
-#endif
-
-
    block_state::block_state( const block_header_state& prev, block_timestamp_type when )
    :block_header_state( prev.generate_next( when ) ), 
     block( std::make_shared<signed_block>()  )

libraries/chain/controller.cpp

@@ -612,7 +612,6 @@ struct controller_impl {
                                                     : transaction_receipt::delayed;
                trace->receipt = push_receipt(trx->packed_trx, s, trace->cpu_usage, trace->net_usage);
                pending->_pending_block_state->trxs.emplace_back(trx);
-               unapplied_transactions.erase( trx->signed_id );
             } else {
                transaction_receipt_header r;
                r.status = transaction_receipt::executed;
@@ -629,6 +628,10 @@ struct controller_impl {
 
             trx_context.squash();
             restore.cancel();
+
+            if (!implicit) {
+               unapplied_transactions.erase( trx->signed_id );
+            }
             return trace;
          } catch (const fc::exception& e) {
             trace->except = e;
@@ -1282,7 +1285,9 @@ vector<transaction_id_type> controller::get_scheduled_transactions() const {
    const auto& idx = db().get_index<generated_transaction_multi_index,by_delay>();
 
    vector<transaction_id_type> result;
-   result.reserve(idx.size());
+
+   static const size_t max_reserve = 64;
+   result.reserve(std::min(idx.size(), max_reserve));
 
    auto itr = idx.begin();
    while( itr != idx.end() && itr->delay_until <= pending_block_time() ) {

libraries/chain/eosio_contract_abi.cpp

@@ -178,7 +178,7 @@ abi_def eosio_contract_abi(const abi_def& eosio_system_abi)
          {"ref_block_num", "uint16"},
          {"ref_block_prefix", "uint32"},
          {"max_net_usage_words", "varuint32"},
-         {"max_kcpu_usage", "varuint32"},
+         {"max_cpu_usage_ms", "uint8"},
          {"delay_sec", "varuint32"}
       }
    });

libraries/chain/include/eosio/chain/transaction.hpp

@@ -32,7 +32,7 @@ namespace eosio { namespace chain {
       uint16_t               ref_block_num       = 0U; ///< specifies a block num in the last 2^16 blocks.
       uint32_t               ref_block_prefix    = 0UL; ///< specifies the lower 32 bits of the blockid at get_ref_blocknum
       fc::unsigned_int       max_net_usage_words = 0UL; /// upper limit on total network bandwidth (in 8 byte words) billed for this transaction
-      fc::unsigned_int       max_kcpu_usage      = 0UL; /// upper limit on the total number of kilo CPU usage units billed for this transaction
+      uint8_t                max_cpu_usage_ms    = 0UL; /// upper limit on the total number of kilo CPU usage units billed for this transaction
       fc::unsigned_int       delay_sec           = 0UL; /// number of seconds to delay this transaction for during which it may be canceled.
 
       /**
@@ -187,7 +187,7 @@ namespace eosio { namespace chain {
 } } /// namespace eosio::chain
 
 FC_REFLECT( eosio::chain::transaction_header, (expiration)(ref_block_num)(ref_block_prefix)
-                                              (max_net_usage_words)(max_kcpu_usage)(delay_sec) )
+                                              (max_net_usage_words)(max_cpu_usage_ms)(delay_sec) )
 FC_REFLECT_DERIVED( eosio::chain::transaction, (eosio::chain::transaction_header), (context_free_actions)(actions)(transaction_extensions) )
 FC_REFLECT_DERIVED( eosio::chain::signed_transaction, (eosio::chain::transaction), (signatures)(context_free_data) )
 FC_REFLECT_ENUM( eosio::chain::packed_transaction::compression_type, (none)(zlib))

libraries/chain/transaction.cpp

@@ -58,8 +58,6 @@ bool transaction_header::verify_reference_block( const block_id_type& reference_
 }
 
 void transaction_header::validate()const {
-   EOS_ASSERT( max_kcpu_usage.value < UINT32_MAX / 1024UL, transaction_exception,
-               "declared max_kcpu_usage overflows when expanded to max cpu usage" );
    EOS_ASSERT( max_net_usage_words.value < UINT32_MAX / 8UL, transaction_exception,
                "declared max_net_usage_words overflows when expanded to max net usage" );
 }

libraries/chain/transaction_context.cpp

@@ -50,7 +50,8 @@ namespace eosio { namespace chain {
       uint64_t trx_specified_net_usage_limit = static_cast<uint64_t>(trx.max_net_usage_words.value)*8;
       if( trx_specified_net_usage_limit > 0 )
          max_net = std::min( max_net, trx_specified_net_usage_limit );
-      uint64_t trx_specified_cpu_usage_limit = static_cast<uint64_t>(trx.max_kcpu_usage.value)*1024;
+
+      uint64_t trx_specified_cpu_usage_limit = 1000 * uint64_t( trx.max_cpu_usage_ms );
       if( trx_specified_cpu_usage_limit > 0 )
          max_cpu = std::min( max_cpu, trx_specified_cpu_usage_limit );
 

libraries/testing/tester.cpp

@@ -189,7 +189,7 @@ namespace eosio { namespace testing {
      trx.set_reference_block( control->head_block_id() );
 
      trx.max_net_usage_words = 0; // No limit
-     trx.max_kcpu_usage = 0; // No limit
+     trx.max_cpu_usage_ms = 0; // No limit
      trx.delay_sec = delay_sec;
   }
 

programs/cleos/main.cpp

@@ -157,7 +157,7 @@ bool   tx_dont_broadcast = false;
 bool   tx_skip_sign = false;
 bool   tx_print_json = false;
 
-uint32_t tx_max_cpu_usage = 0;
+uint8_t  tx_max_cpu_usage = 0;
 uint32_t tx_max_net_usage = 0;
 
 vector<string> tx_permission;
@@ -185,7 +185,7 @@ void add_standard_transaction_options(CLI::App* cmd, string default_permission =
       msg += " (defaults to '" + default_permission + "')";
    cmd->add_option("-p,--permission", tx_permission, localized(msg.c_str()));
 
-   cmd->add_option("--max-cpu-usage", tx_max_cpu_usage, localized("set an upper limit on the cpu usage budget, in instructions-retired, for the execution of the transaction (defaults to 0 which means no limit)"));
+   cmd->add_option("--max-cpu-usage-ms", tx_max_cpu_usage, localized("set an upper limit on the milliseconds of cpu usage budget, for the execution of the transaction (defaults to 0 which means no limit)"));
    cmd->add_option("--max-net-usage", tx_max_net_usage, localized("set an upper limit on the net usage budget, in bytes, for the transaction (defaults to 0 which means no limit)"));
 }
 
@@ -273,7 +273,7 @@ fc::variant push_transaction( signed_transaction& trx, int32_t extra_kcpu = 1000
    auto required_keys = determine_required_keys(trx);
    size_t num_keys = required_keys.is_array() ? required_keys.get_array().size() : 1;
 
-   trx.max_kcpu_usage = (tx_max_cpu_usage + 1023)/1024;
+   trx.max_cpu_usage_ms = tx_max_net_usage;
    trx.max_net_usage_words = (tx_max_net_usage + 7)/8;
 
    if (!tx_skip_sign) {
@@ -1983,7 +1983,7 @@ int main( int argc, char** argv ) {
       trx.ref_block_num = 0;
       trx.ref_block_prefix = 0;
       trx.max_net_usage_words = 0;
-      trx.max_kcpu_usage = 0;
+      trx.max_cpu_usage_ms = 0;
       trx.delay_sec = 0;
       trx.actions = { chain::action(trxperm, name(proposed_contract), name(proposed_action), proposed_trx_serialized) };
 

scripts/eosio_build_amazon.sh

 	OS_VER=$( cat /etc/os-release | grep VERSION_ID | cut -d'=' -f2 | sed 's/[^0-9\.]//gI' | cut -d'.' -f1 )
 
-	MEM_MEG=$( free -m | grep Mem | tr -s ' ' | cut -d\  -f2 )
+	MEM_MEG=$( free -m | sed -n 2p | tr -s ' ' | cut -d\  -f2 )
 	CPU_SPEED=$( lscpu | grep "MHz" | tr -s ' ' | cut -d\  -f3 | cut -d'.' -f1 )
 	CPU_CORE=$( lscpu | grep "^CPU(s)" | tr -s ' ' | cut -d\  -f2 )
 	MEM_GIG=$(( (($MEM_MEG / 1000) / 2) ))

scripts/eosio_build_centos.sh

 	OS_VER=$( cat /etc/os-release | grep VERSION_ID | cut -d'=' -f2 | sed 's/[^0-9\.]//gI' \
 	| cut -d'.' -f1 )
 
-	MEM_MEG=$( free -m | grep Mem | tr -s ' ' | cut -d\  -f2 )
+	MEM_MEG=$( free -m | sed -n 2p | tr -s ' ' | cut -d\  -f2 )
 	CPU_SPEED=$( lscpu | grep "MHz" | tr -s ' ' | cut -d\  -f3 | cut -d'.' -f1 )
 	CPU_CORE=$( lscpu | grep "^CPU(s)" | tr -s ' ' | cut -d\  -f2 )
 	MEM_GIG=$(( (($MEM_MEG / 1000) / 2) ))

scripts/eosio_build_fedora.sh

 	OS_VER=$( cat /etc/os-release | grep VERSION_ID | cut -d'=' -f2 | sed 's/[^0-9\.]//gI' )
 
-	MEM_MEG=$( free -m | grep Mem | tr -s ' ' | cut -d\  -f2 )
+	MEM_MEG=$( free -m | sed -n 2p | tr -s ' ' | cut -d\  -f2 )
 	CPU_SPEED=$( lscpu | grep "MHz" | tr -s ' ' | cut -d\  -f3 | cut -d'.' -f1 )
 	CPU_CORE=$( lscpu | grep "^CPU(s)" | tr -s ' ' | cut -d\  -f2 )
 	MEM_GIG=$(( (($MEM_MEG / 1000) / 2) ))

scripts/eosio_build_ubuntu.sh

@@ -2,7 +2,7 @@
 	OS_MAJ=`echo "${OS_VER}" | cut -d'.' -f1`
 	OS_MIN=`echo "${OS_VER}" | cut -d'.' -f2`
 
-	MEM_MEG=$( free -m | grep Mem | tr -s ' ' | cut -d\  -f2 || cut -d' ' -f2 )
+	MEM_MEG=$( free -m | sed -n 2p | tr -s ' ' | cut -d\  -f2 || cut -d' ' -f2 )
 	CPU_SPEED=$( lscpu | grep -m1 "MHz" | tr -s ' ' | cut -d\  -f3 || cut -d' ' -f3 | cut -d'.' -f1 )
 	CPU_CORE=$( lscpu | grep "^CPU(s)" | tr -s ' ' | cut -d\  -f2 || cut -d' ' -f2 )
 

tests/testUtils.py

@@ -1251,7 +1251,7 @@ class Cluster(object):
         if self.staging:
             cmdArr.append("--nogen")
 
-        nodeosArgs="--max-pending-transaction-time 5000"
+        nodeosArgs="--max-transaction-time 5000"
         if not self.walletd:
             nodeosArgs += " --plugin eosio::wallet_api_plugin"
         if self.enableMongo:

unittests/abi_tests.cpp

@@ -1807,7 +1807,7 @@ BOOST_AUTO_TEST_CASE(general)
         "context_free_actions":[{"account":"contextfree1", "name":"cfactionname1", "authorization":[{"actor":"cfacc1","permission":"cfpermname1"}], "data":"778899"}],
         "actions":[{"account":"accountname1", "name":"actionname1", "authorization":[{"actor":"acc1","permission":"permname1"}], "data":"445566"}],
         "max_net_usage_words":15,
-        "max_kcpu_usage":43,
+        "max_cpu_usage_ms":43,
         "delay_sec":0
       },
       "transaction_arr": [{
@@ -1817,7 +1817,7 @@ BOOST_AUTO_TEST_CASE(general)
         "context_free_actions":[{"account":"contextfree1", "name":"cfactionname1", "authorization":[{"actor":"cfacc1","permission":"cfpermname1"}], "data":"778899"}],
         "actions":[{"account":"acc1", "name":"actionname1", "authorization":[{"actor":"acc1","permission":"permname1"}], "data":"445566"}],
         "max_net_usage_words":15,
-        "max_kcpu_usage":43,
+        "max_cpu_usage_ms":43,
         "delay_sec":0
       },{
         "ref_block_num":"2",
@@ -1826,7 +1826,7 @@ BOOST_AUTO_TEST_CASE(general)
         "context_free_actions":[{"account":"contextfree1", "name":"cfactionname1", "authorization":[{"actor":"cfacc1","permission":"cfpermname1"}], "data":"778899"}],
         "actions":[{"account":"acc2", "name":"actionname2", "authorization":[{"actor":"acc2","permission":"permname2"}], "data":""}],
         "max_net_usage_words":21,
-        "max_kcpu_usage":87,
+        "max_cpu_usage_ms":87,
         "delay_sec":0
       }],
       "strx": {
@@ -1839,7 +1839,7 @@ BOOST_AUTO_TEST_CASE(general)
         "context_free_actions":[{"account":"contextfree1", "name":"cfactionname1", "authorization":[{"actor":"cfacc1","permission":"cfpermname1"}], "data":"778899"}],
         "actions":[{"account":"accountname1", "name":"actionname1", "authorization":[{"actor":"acc1","permission":"permname1"}], "data":"445566"}],
         "max_net_usage_words":15,
-        "max_kcpu_usage":43,
+        "max_cpu_usage_ms":43,
         "delay_sec":0
       },
       "strx_arr": [{
@@ -1852,7 +1852,7 @@ BOOST_AUTO_TEST_CASE(general)
         "context_free_actions":[{"account":"contextfree1", "name":"cfactionname1", "authorization":[{"actor":"cfacc1","permission":"cfpermname1"}], "data":"778899"}],
         "actions":[{"account":"acc1", "name":"actionname1", "authorization":[{"actor":"acc1","permission":"permname1"}], "data":"445566"}],
         "max_net_usage_words":15,
-        "max_kcpu_usage":43,
+        "max_cpu_usage_ms":43,
         "delay_sec":0
       },{
         "ref_block_num":"2",
@@ -1864,7 +1864,7 @@ BOOST_AUTO_TEST_CASE(general)
         "context_free_actions":[{"account":"contextfree2", "name":"cfactionname2", "authorization":[{"actor":"cfacc2","permission":"cfpermname2"}], "data":"667788"}],
         "actions":[{"account":"acc2", "name":"actionname2", "authorization":[{"actor":"acc2","permission":"permname2"}], "data":""}],
         "max_net_usage_words":15,
-        "max_kcpu_usage":43,
+        "max_cpu_usage_ms":43,
         "delay_sec":0
       }],
       "keyweight": {"key":"EOS6MRyAjQq8ud7hVNYcfnVPJqcVpscN5So8BhtHuGYqET5GDW5CV", "weight":"100"},
@@ -2549,7 +2549,7 @@ BOOST_AUTO_TEST_CASE(packed_transaction)
          vector<permission_level>{{N(testapi4), config::active_name}},
          action2{ 61, 23, (uint8_t)2});
    txn.max_net_usage_words = 15;
-   txn.max_kcpu_usage = 43;
+   txn.max_cpu_usage_ms = 43;
 
    // pack the transaction to verify that the var unpacking logic is correct
    auto packed_txn = chain::packed_transaction(txn);
@@ -2630,7 +2630,7 @@ BOOST_AUTO_TEST_CASE(packed_transaction)
    for (unsigned int i = 0; i < txn.actions.size(); ++i)
       verify_action_equal<action2>(txn.actions[i], txn2.actions[i]);
    BOOST_REQUIRE_EQUAL(txn.max_net_usage_words.value, txn2.max_net_usage_words.value);
-   BOOST_REQUIRE_EQUAL(txn.max_kcpu_usage.value, txn2.max_kcpu_usage.value);
+   BOOST_REQUIRE_EQUAL(txn.max_cpu_usage_ms, txn2.max_cpu_usage_ms);
 } FC_LOG_AND_RETHROW() }
 
 BOOST_AUTO_TEST_CASE(abi_type_repeat)

unittests/multisig_tests.cpp

@@ -84,7 +84,7 @@ transaction eosio_msig_tester::reqauth( account_name from, const vector<permissi
       ("ref_block_num", 2)
       ("ref_block_prefix", 3)
       ("max_net_usage_words", 0)
-      ("max_kcpu_usage", 0)
+      ("max_cpu_usage_ms", 0)
       ("delay_sec", 0)
       ("actions", fc::variants({
             fc::mutable_variant_object()
@@ -249,7 +249,7 @@ BOOST_FIXTURE_TEST_CASE( big_transaction, eosio_msig_tester ) try {
       ("ref_block_num", 2)
       ("ref_block_prefix", 3)
       ("max_net_usage_words", 0)
-      ("max_kcpu_usage", 0)
+      ("max_cpu_usage_ms", 0)
       ("delay_sec", 0)
       ("actions", fc::variants({
             fc::mutable_variant_object()

unittests/wasm_tests.cpp

@@ -514,6 +514,8 @@ BOOST_FIXTURE_TEST_CASE(misaligned_tests, tester ) try {
 } FC_LOG_AND_RETHROW()
 
 // test cpu usage
+
+/*  Comment out this test due to not being robust to changes
 BOOST_FIXTURE_TEST_CASE(cpu_usage_tests, tester ) try {
 #warning This test does not appear to be very robust.
    create_accounts( {N(f_tests)} );
@@ -562,7 +564,7 @@ BOOST_FIXTURE_TEST_CASE(cpu_usage_tests, tester ) try {
       }
 
       set_transaction_headers(trx);
-      trx.max_kcpu_usage = limit++;
+      trx.max_cpu_usage_ms = limit++;
       trx.sign(get_private_key( N(f_tests), "active" ), chain_id_type());
 
       try {
@@ -578,6 +580,7 @@ BOOST_FIXTURE_TEST_CASE(cpu_usage_tests, tester ) try {
    wdump((limit));
    BOOST_CHECK_EQUAL(true, start < limit && limit < end);
 } FC_LOG_AND_RETHROW()
+*/
 
 
 // test weighted cpu limit