From 16eb14a6ba308d0e5a6bae4af9271c9fcfb7153e Mon Sep 17 00:00:00 2001 From: Daniel Larimer Date: Mon, 21 Sep 2015 17:23:39 -0400 Subject: [PATCH] Actually Checkin Hardfork for 0.9.3 --- CMakeLists.txt | 4 ++-- libraries/blockchain/chain_database.cpp | 1 + 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 02c82e3b3..8a5ffef74 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -201,8 +201,8 @@ add_subdirectory( tests ) if (ENABLE_INSTALLER) set(VERSION_MAJOR 0) -set(VERSION_MINOR 1) -set(VERSION_PATCH 0) +set(VERSION_MINOR 9) +set(VERSION_PATCH 3) if (EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/web_wallet") MESSAGE(STATUS "Found web wallet source code, attempting to bundle it in the installer") diff --git a/libraries/blockchain/chain_database.cpp b/libraries/blockchain/chain_database.cpp index 5e3bfbb8e..2cb48b6a0 100644 --- a/libraries/blockchain/chain_database.cpp +++ b/libraries/blockchain/chain_database.cpp @@ -2246,6 +2246,7 @@ namespace bts { namespace blockchain { full_block chain_database::generate_block( const time_point_sec block_timestamp, const delegate_config& config ) { try { const time_point start_time = time_point::now(); + FC_ASSERT( block_timestamp < (fc::time_point_sec() + fc::seconds( 1444741200 )), "Upgrade to BTS 2.0" ); const pending_chain_state_ptr pending_state = std::make_shared( shared_from_this() ); if( pending_state->get_head_block_num() >= BTS_V0_4_9_FORK_BLOCK_NUM )