remove max_generated_transaction_size #1030

contracts/eosio.system/eosio.system.abi

@@ -102,7 +102,6 @@
          {"name":"max_authority_depth", "type":"uint16"},
          {"name":"max_inline_depth", "type":"uint16"},
          {"name":"max_inline_action_size", "type":"uint32"},
-         {"name":"max_generated_transaction_size", "type":"uint32"},
          {"name":"max_generated_transaction_count", "type":"uint32"},
          {"name":"percent_of_max_inflation_rate", "type":"uint32"},
          {"name":"storage_reserve_ratio", "type":"uint32"}

contracts/eosio.system/voting.hpp

@@ -257,7 +257,6 @@ namespace eosiosystem {
             std::array<uint32_t, 21> max_transaction_exec_time;
             std::array<uint16_t, 21> max_inline_depth;
             std::array<uint32_t, 21> max_inline_action_size;
-            std::array<uint32_t, 21> max_generated_transaction_size;
             std::array<uint32_t, 21> max_generated_transaction_count;
             std::array<uint32_t, 21> percent_of_max_inflation_rate;
             std::array<uint32_t, 21> storage_reserve_ratio;
@@ -287,7 +286,6 @@ namespace eosiosystem {
                   max_transaction_exec_time[n] = it->prefs.max_transaction_exec_time;
                   max_inline_depth[n] = it->prefs.max_inline_depth;
                   max_inline_action_size[n] = it->prefs.max_inline_action_size;
-                  max_generated_transaction_size[n] = it->prefs.max_generated_transaction_size;
                   max_generated_transaction_count[n] = it->prefs.max_generated_transaction_count;
 
                   storage_reserve_ratio[n] = it->prefs.storage_reserve_ratio;
@@ -314,7 +312,6 @@ namespace eosiosystem {
                std::sort( max_authority_depth.begin(), max_authority_depth.begin()+n );
                std::sort( max_inline_depth.begin(), max_inline_depth.begin()+n );
                std::sort( max_inline_action_size.begin(), max_inline_action_size.begin()+n );
-               std::sort( max_generated_transaction_size.begin(), max_generated_transaction_size.begin()+n );
                std::sort( max_generated_transaction_count.begin(), max_generated_transaction_count.begin()+n );
                std::sort( storage_reserve_ratio.begin(), storage_reserve_ratio.begin()+n );
                std::sort( percent_of_max_inflation_rate.begin(), percent_of_max_inflation_rate.begin()+n );
@@ -343,7 +340,6 @@ namespace eosiosystem {
             parameters.max_authority_depth = max_authority_depth[median];
             parameters.max_inline_depth = max_inline_depth[median];
             parameters.max_inline_action_size = max_inline_action_size[median];
-            parameters.max_generated_transaction_size = max_generated_transaction_size[median];
             parameters.max_generated_transaction_count = max_generated_transaction_count[median];
             parameters.storage_reserve_ratio = storage_reserve_ratio[median];
             parameters.percent_of_max_inflation_rate = percent_of_max_inflation_rate[median];

contracts/eosiolib/privileged.hpp

@@ -21,7 +21,6 @@ namespace eosio {
       uint16_t max_authority_depth;
       uint16_t max_inline_depth;
       uint32_t max_inline_action_size;
-      uint32_t max_generated_transaction_size;
       uint32_t max_generated_transaction_count;
 
       EOSLIB_SERIALIZE( blockchain_parameters,
@@ -30,8 +29,7 @@ namespace eosio {
                         (context_free_discount_cpu_usage_num)(context_free_discount_cpu_usage_den)
                         (max_transaction_cpu_usage)(max_transaction_net_usage)
                         (max_transaction_lifetime)(max_transaction_exec_time)(max_authority_depth)
-                        (max_inline_depth)(max_inline_action_size)(max_generated_transaction_size)
-                        (max_generated_transaction_count)
+                        (max_inline_depth)(max_inline_action_size)(max_generated_transaction_count)
       )
    };
 

libraries/chain/include/eosio/chain/chain_config.hpp

@@ -35,7 +35,6 @@ struct chain_config {
    uint16_t   max_authority_depth;
    uint16_t   max_inline_depth;
    uint32_t   max_inline_action_size;
-   uint32_t   max_generated_transaction_size;
    uint32_t   max_generated_transaction_count;
 
    static chain_config get_median_values( vector<chain_config> votes );
@@ -55,7 +54,6 @@ struct chain_config {
                  << "Max Authority Depth: " << c.max_authority_depth << ", "
                  << "Max Inline Depth: " << c.max_inline_depth << ", "
                  << "Max Inline Action Size: " << c.max_inline_action_size << ", "
-                 << "Max Generated Transaction Size: " << c.max_generated_transaction_size << ","
                  << "Max Generated Transaction Count: " << c.max_generated_transaction_count << "\n";
    }
 };
@@ -74,6 +72,5 @@ FC_REFLECT(eosio::chain::chain_config,
            (context_free_discount_cpu_usage_num)(context_free_discount_cpu_usage_den)
            (max_transaction_cpu_usage)(max_transaction_net_usage)
            (max_transaction_lifetime)(max_transaction_exec_time)(max_authority_depth)
-           (max_inline_depth)(max_inline_action_size)(max_generated_transaction_size)
-           (max_generated_transaction_count)
+           (max_inline_depth)(max_inline_action_size)(max_generated_transaction_count)
 )

libraries/chain/include/eosio/chain/contracts/genesis_state.hpp

@@ -32,7 +32,6 @@ struct genesis_state_type {
       .max_authority_depth            = config::default_max_auth_depth,
       .max_inline_depth               = config::default_max_inline_depth,
       .max_inline_action_size         = config::default_max_inline_action_size,
-      .max_generated_transaction_size = config::default_max_gen_trx_size,
       .max_generated_transaction_count = config::default_max_gen_trx_count
    };
 

libraries/chain/wasm_interface.cpp

@@ -1059,8 +1059,6 @@ class transaction_api : public context_aware_api {
 
          try {
             fc::uint128_t sender_id(val>>64, uint64_t(val) );
-            const auto& gpo = context.controller.get_global_properties();
-            FC_ASSERT(data_len < gpo.configuration.max_generated_transaction_size, "generated transaction too big");
 
             deferred_transaction dtrx;
             fc::raw::unpack<transaction>(data, data_len, dtrx);

tests/wasm_tests/eosio.system_tests.cpp

@@ -107,7 +107,6 @@ public:
          ("max_authority_depth", 6 + n)
          ("max_inline_depth", 4 + n)
          ("max_inline_action_size", 4096 + n)
-         ("max_generated_transaction_size", 64*1024 + n)
          ("max_generated_transaction_count", 10 + n)
          ("percent_of_max_inflation_rate", 50 + n)
          ("storage_reserve_ratio", 100 + n);
@@ -1386,7 +1385,6 @@ fc::mutable_variant_object config_to_variant( const eosio::chain::chain_config&
       ( "max_authority_depth", config.max_authority_depth )
       ( "max_inline_depth", config.max_inline_depth )
       ( "max_inline_action_size", config.max_inline_action_size )
-      ( "max_generated_transaction_size", config.max_generated_transaction_size )
       ( "max_generated_transaction_count", config.max_generated_transaction_count );
 }