Peerplays_Blockchain/peerplays_migrated
1
0
Fork 0
Code Issues 35 Pull requests 4 Projects Releases 20 Packages Wiki Activity Actions

Add hard fork logic for #615 feed expiration check issue, fix #540

Browse source
This commit is contained in:
abitmore 2016-03-10 06:12:58 +08:00
parent 3c6f4ce223
commit f1cd2c2454
3 changed files with 12 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
libraries/chain/db_update.cpp
View file

@ -434,7 +434,12 @@ void database::update_expired_feeds()
assert( a.is_market_issued() ); assert( a.is_market_issued() );
const asset_bitasset_data_object& b = a.bitasset_data(*this); const asset_bitasset_data_object& b = a.bitasset_data(*this);
if( b.feed_is_expired(head_block_time()) ) bool feed_is_expired;
if( head_block_time() < HARDFORK_615_TIME )
feed_is_expired = b.feed_is_expired_before_hardfork_615( head_block_time() );
else
feed_is_expired = b.feed_is_expired( head_block_time() );
if( feed_is_expired )
{ {
modify(b, [this](asset_bitasset_data_object& a) { modify(b, [this](asset_bitasset_data_object& a) {
a.update_median_feeds(head_block_time()); a.update_median_feeds(head_block_time());

4
libraries/chain/hardfork.d/615.hf Normal file
View file

@ -0,0 +1,4 @@
// #615 Fix price feed expiration check, so websocket server will never spam too much data
#ifndef HARDFORK_615_TIME
#define HARDFORK_615_TIME (fc::time_point_sec( 1457550000 ))
#endif

2
libraries/chain/include/graphene/chain/asset_object.hpp
View file

@ -211,6 +211,8 @@ namespace graphene { namespace chain {
time_point_sec feed_expiration_time()const time_point_sec feed_expiration_time()const
{ return current_feed_publication_time + options.feed_lifetime_sec; } { return current_feed_publication_time + options.feed_lifetime_sec; }
bool feed_is_expired_before_hardfork_615(time_point_sec current_time)const
{ return feed_expiration_time() >= current_time; }
bool feed_is_expired(time_point_sec current_time)const bool feed_is_expired(time_point_sec current_time)const
{ return feed_expiration_time() <= current_time; } { return feed_expiration_time() <= current_time; }
void update_median_feeds(time_point_sec current_time); void update_median_feeds(time_point_sec current_time);