Merge pull request #1006 from steemit/steem-prerelease-v0.18.2

Steem prerelease v0.18.2
steemit · Mar 30, 2017 · 405f6e7 · 405f6e7
2 parents d54d063 + d182eef
commit 405f6e7
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/libraries/app/database_api.cpp b/libraries/app/database_api.cpp
@@ -1132,7 +1132,7 @@ void database_api::set_pending_payout( discussion& d )const
    else
       total_r2 = to256( props.total_reward_shares2 );
 
-   if( props.total_reward_shares2 > 0 )
+   if( total_r2 > 0 )
    {
       uint128_t vshares;
       if( my->_db.has_hardfork( STEEMIT_HARDFORK_0_17__774 ) )
@@ -1463,7 +1463,7 @@ vector<discussion> database_api::get_discussions_by_promoted( const discussion_q
       const auto& tidx = my->_db.get_index<tags::tag_index>().indices().get<tags::by_parent_promoted>();
       auto tidx_itr = tidx.lower_bound( boost::make_tuple( tag, parent, share_type(STEEMIT_MAX_SHARE_SUPPLY) )  );
 
-      return get_discussions( query, tag, parent, tidx, tidx_itr, query.truncate_body, []( const comment_api_obj& c ){ return c.children_rshares2 <= 0; }, exit_default, []( const tags::tag_object& t ){ return t.promoted_balance == 0; }  );
+      return get_discussions( query, tag, parent, tidx, tidx_itr, query.truncate_body, filter_default, exit_default, []( const tags::tag_object& t ){ return t.promoted_balance == 0; }  );
    });
 }
 
@@ -2051,6 +2051,7 @@ state database_api::get_state( string path )const
                   case operation::tag<escrow_release_operation>::value:
                   case operation::tag<fill_convert_request_operation>::value:
                   case operation::tag<fill_order_operation>::value:
+                  case operation::tag<claim_reward_balance_operation>::value:
                      eacnt.transfer_history[item.first] =  item.second;
                      break;
                   case operation::tag<comment_operation>::value:

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, 18, 1) )
+#define STEEMIT_BLOCKCHAIN_VERSION              ( version(0, 18, 2) )
 #define STEEMIT_BLOCKCHAIN_HARDFORK_VERSION     ( hardfork_version( STEEMIT_BLOCKCHAIN_VERSION ) )
 
 #ifdef IS_TEST_NET