From 9145b63d9879446c6e95058b98d9a2f33c4d6b48 Mon Sep 17 00:00:00 2001 From: Vikram Rajkumar Date: Mon, 18 May 2015 12:43:56 -0400 Subject: [PATCH] Reject bad cover operations again --- libraries/blockchain/include/bts/blockchain/fork_blocks.hpp | 1 + libraries/blockchain/transaction_evaluation_state.cpp | 6 +----- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/libraries/blockchain/include/bts/blockchain/fork_blocks.hpp b/libraries/blockchain/include/bts/blockchain/fork_blocks.hpp index a672babbb..885d5833d 100644 --- a/libraries/blockchain/include/bts/blockchain/fork_blocks.hpp +++ b/libraries/blockchain/include/bts/blockchain/fork_blocks.hpp @@ -34,6 +34,7 @@ #define BTS_V0_8_0_FORK_BLOCK_NUM 2113000 #define BTS_V0_9_0_FORK_BLOCK_NUM 2460000 #define BTS_V0_9_1_FORK_BLOCK_NUM BTS_V0_9_0_FORK_BLOCK_NUM +#define BTS_V0_9_2_FORK_BLOCK_NUM 2580000 #define BTS_FORK_TO_UNIX_TIME_LIST ((BTS_V0_4_0_FORK_BLOCK_NUM, "0.4.0", 1408064036)) \ ((BTS_V0_4_9_FORK_2_BLOCK_NUM, "0.4.9", 1409193626)) \ diff --git a/libraries/blockchain/transaction_evaluation_state.cpp b/libraries/blockchain/transaction_evaluation_state.cpp index 91110e421..0923b0382 100644 --- a/libraries/blockchain/transaction_evaluation_state.cpp +++ b/libraries/blockchain/transaction_evaluation_state.cpp @@ -118,11 +118,7 @@ namespace bts { namespace blockchain { } } -#ifndef WIN32 -#warning [SOFTFORK] Remove this check after BTS_V0_9_0_FORK_BLOCK_NUM has passed -#endif - if( pending_state()->get_head_block_num() >= BTS_V0_7_0_FORK_BLOCK_NUM - && pending_state()->get_head_block_num() < BTS_V0_9_0_FORK_BLOCK_NUM ) + if( pending_state()->get_head_block_num() >= BTS_V0_9_2_FORK_BLOCK_NUM ) { for( const auto& op : trx.operations ) {