diff --git a/libraries/config/src/config.cpp b/libraries/config/src/config.cpp index 26c915b210..54fdcfc3d3 100644 --- a/libraries/config/src/config.cpp +++ b/libraries/config/src/config.cpp @@ -20,9 +20,9 @@ void dec_json(Json::Value const &json, DBConfig &db_config) { std::vector FullNodeConfig::loadLoggingConfigs(const Json::Value &logging) { // could be empty if config loaded from json e.g. tests - if (!json_file_name.empty()) { - last_json_update_time = std::filesystem::last_write_time(std::filesystem::path(json_file_name)); - } + // if (!json_file_name.empty()) { + // last_json_update_time = std::filesystem::last_write_time(std::filesystem::path(json_file_name)); + // } std::vector res; if (!logging.isNull()) { if (auto path = getConfigData(logging, {"log_path"}, true); !path.isNull()) { diff --git a/libraries/core_libs/node/src/node.cpp b/libraries/core_libs/node/src/node.cpp index cb65d26a3a..1aca413396 100644 --- a/libraries/core_libs/node/src/node.cpp +++ b/libraries/core_libs/node/src/node.cpp @@ -50,7 +50,7 @@ void FullNode::init() { logging.InitLogging(node_addr); } - conf_.scheduleLoggingConfigUpdate(); + // conf_.scheduleLoggingConfigUpdate(); LOG_OBJECTS_CREATE("FULLND"); diff --git a/libraries/types/pbft_block/src/pbft_block.cpp b/libraries/types/pbft_block/src/pbft_block.cpp index 54dadeca97..a3f38f8540 100644 --- a/libraries/types/pbft_block/src/pbft_block.cpp +++ b/libraries/types/pbft_block/src/pbft_block.cpp @@ -15,7 +15,9 @@ PbftBlock::PbftBlock(dev::RLP const& rlp) { dev::bytes extra_data_bytes; util::rlp_tuple(util::RLPDecoderRef(rlp, true), prev_block_hash_, dag_block_hash_as_pivot_, order_hash_, prev_state_root_hash_, period_, timestamp_, reward_votes_, extra_data_bytes, signature_); - extra_data_ = PbftBlockExtraData(extra_data_bytes); + if (!extra_data_bytes.empty()) { + extra_data_ = PbftBlockExtraData(extra_data_bytes); + } } else { util::rlp_tuple(util::RLPDecoderRef(rlp, true), prev_block_hash_, dag_block_hash_as_pivot_, order_hash_, prev_state_root_hash_, period_, timestamp_, reward_votes_, signature_);