Merge pull request steemit#1664 from steemit/1655-max-block-size-soft…

…fork Max Block Size Soft Fork
EOSIO · Oct 17, 2017 · 56c4d89 · 56c4d89
2 parents 06217d5 + 7ae40bb
commit 56c4d89
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 1 deletion.
diff --git a/libraries/chain/steem_evaluator.cpp b/libraries/chain/steem_evaluator.cpp
@@ -85,6 +85,12 @@ void witness_update_evaluator::do_apply( const witness_update_operation& o )
       wlog( "Wrong fee symbol in block ${b}", ("b", _db.head_block_num()+1) );
    }
 
+   #pragma message( "TODO: This needs to be part of HF 20 and moved to validate if not triggered in previous blocks" )
+   if( _db.is_producing() )
+   {
+      FC_ASSERT( o.props.maximum_block_size <= STEEMIT_SOFT_MAX_BLOCK_SIZE, "Max block size cannot be more than 2MiB" );
+   }
+
    const auto& by_witness_name_idx = _db.get_index< witness_index >().indices().get< by_name >();
    auto wit_itr = by_witness_name_idx.find( o.owner );
    if( wit_itr != by_witness_name_idx.end() )

diff --git a/libraries/protocol/get_config.cpp b/libraries/protocol/get_config.cpp
@@ -85,6 +85,7 @@ fc::variant_object get_config()
    result["STEEMIT_MAX_ASSET_WHITELIST_AUTHORITIES"] = STEEMIT_MAX_ASSET_WHITELIST_AUTHORITIES;
    result["STEEMIT_MAX_AUTHORITY_MEMBERSHIP"] = STEEMIT_MAX_AUTHORITY_MEMBERSHIP;
    result["STEEMIT_MAX_BLOCK_SIZE"] = STEEMIT_MAX_BLOCK_SIZE;
+   result["STEEMIT_SOFT_MAX_BLOCK_SIZE"] = STEEMIT_SOFT_MAX_BLOCK_SIZE;
    result["STEEMIT_MAX_CASHOUT_WINDOW_SECONDS"] = STEEMIT_MAX_CASHOUT_WINDOW_SECONDS;
    result["STEEMIT_MAX_COMMENT_DEPTH"] = STEEMIT_MAX_COMMENT_DEPTH;
    result["STEEMIT_MAX_COMMENT_DEPTH_PRE_HF17"] = STEEMIT_MAX_COMMENT_DEPTH_PRE_HF17;

diff --git a/libraries/protocol/include/steemit/protocol/config.hpp b/libraries/protocol/include/steemit/protocol/config.hpp
@@ -3,7 +3,7 @@
  */
 #pragma once
 
-#define STEEMIT_BLOCKCHAIN_VERSION              ( version(0, 19, 2) )
+#define STEEMIT_BLOCKCHAIN_VERSION              ( version(0, 19, 3) )
 #define STEEMIT_BLOCKCHAIN_HARDFORK_VERSION     ( hardfork_version( STEEMIT_BLOCKCHAIN_VERSION ) )
 
 #ifdef IS_TEST_NET
@@ -226,6 +226,7 @@
 #define STEEMIT_MAX_TRANSACTION_SIZE            (1024*64)
 #define STEEMIT_MIN_BLOCK_SIZE_LIMIT            (STEEMIT_MAX_TRANSACTION_SIZE)
 #define STEEMIT_MAX_BLOCK_SIZE                  (STEEMIT_MAX_TRANSACTION_SIZE*STEEMIT_BLOCK_INTERVAL*2000)
+#define STEEMIT_SOFT_MAX_BLOCK_SIZE             (2*1024*1024)
 #define STEEMIT_MIN_BLOCK_SIZE                  115
 #define STEEMIT_BLOCKS_PER_HOUR                 (60*60/STEEMIT_BLOCK_INTERVAL)
 #define STEEMIT_FEED_INTERVAL_BLOCKS            (STEEMIT_BLOCKS_PER_HOUR)