From 34a6cd846ffe3aea99a387c111fb29f2138b8fe8 Mon Sep 17 00:00:00 2001 From: Daniel Larimer Date: Wed, 30 Aug 2017 09:56:31 -0400 Subject: [PATCH] update max block size, fix performance of chain_controller::head_block_producer, and increase batch sizes for benchmark --- libraries/chain/chain_controller.cpp | 3 +++ libraries/chain/include/eos/chain/config.hpp | 2 +- programs/eosc/main.cpp | 4 ++-- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/libraries/chain/chain_controller.cpp b/libraries/chain/chain_controller.cpp index 4a0e27541..0a6861e82 100644 --- a/libraries/chain/chain_controller.cpp +++ b/libraries/chain/chain_controller.cpp @@ -1025,6 +1025,9 @@ block_id_type chain_controller::head_block_id()const { } types::AccountName chain_controller::head_block_producer() const { + auto b = _fork_db.fetch_block(head_block_id()); + if( b ) return b->data.producer; + if (auto head_block = fetch_block_by_id(head_block_id())) return head_block->producer; return {}; diff --git a/libraries/chain/include/eos/chain/config.hpp b/libraries/chain/include/eos/chain/config.hpp index b4b6caed1..b178f5477 100644 --- a/libraries/chain/include/eos/chain/config.hpp +++ b/libraries/chain/include/eos/chain/config.hpp @@ -53,7 +53,7 @@ const static int BlockIntervalSeconds = 3; const static int Percent100 = 10000; const static int Percent1 = 100; -const static UInt32 DefaultMaxBlockSize = 1024 * 1024; +const static UInt32 DefaultMaxBlockSize = 5 * 1024 * 1024; const static UInt32 DefaultTargetBlockSize = 128 * 1024; const static UInt64 DefaultMaxStorageSize = 10 * 1024; const static ShareType DefaultElectedPay = Asset(100).amount; diff --git a/programs/eosc/main.cpp b/programs/eosc/main.cpp index 1e54c977d..fb6fad39b 100644 --- a/programs/eosc/main.cpp +++ b/programs/eosc/main.cpp @@ -333,7 +333,7 @@ int main( int argc, char** argv ) { for( uint32_t i = 0; i < number_of_accounts; ++i ) { Name sender( "initb" ); Name recipient( Name("benchmark").value + i); - uint32_t amount = 10000; + uint32_t amount = 100000; SignedTransaction trx; trx.scope = sort_names({sender,recipient}); @@ -381,7 +381,7 @@ int main( int argc, char** argv ) { transaction_set_reference_block(trx, info.head_block_id); batch.emplace_back(trx); - if( batch.size() == 300 ) { + if( batch.size() == 600 ) { auto result = call( push_txns_func, batch ); //std::cout << fc::json::to_pretty_string(result) << std::endl; batch.resize(0); -- GitLab