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

Bug Fix

Browse source
This commit is contained in:
Michael Vandeberg 2016-03-17 18:18:00 -04:00
parent ee3f81fa31
commit 7caf77d6bf
1 changed files with 21 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

39
libraries/app/database_api.cpp
View file

@ -1029,39 +1029,42 @@ market_ticker database_api_impl::get_ticker( const string& base, const string& q
uint32_t day = 86400; uint32_t day = 86400;
auto now = fc::time_point_sec( fc::time_point::now() ); auto now = fc::time_point_sec( fc::time_point::now() );
auto orders = get_order_book( base, quote, 1 );
auto trades = get_trade_history( base, quote, now, fc::time_point_sec( now.sec_since_epoch() - day ), 100 ); auto trades = get_trade_history( base, quote, now, fc::time_point_sec( now.sec_since_epoch() - day ), 100 );
result.latest = trades[0].price; if ( trades.size() )
for ( market_trade t: trades )
{ {
result.base_volume += t.value; result.latest = trades[0].price;
result.quote_volume += t.amount;
}
while (trades.size() == 100)
{
trades = get_trade_history( base, quote, trades[99].date, fc::time_point_sec( now.sec_since_epoch() - day ), 100 );
for ( market_trade t: trades ) for ( market_trade t: trades )
{ {
result.base_volume += t.value; result.base_volume += t.value;
result.quote_volume += t.amount; result.quote_volume += t.amount;
} }
while (trades.size() == 100)
{
trades = get_trade_history( base, quote, trades[99].date, fc::time_point_sec( now.sec_since_epoch() - day ), 100 );
for ( market_trade t: trades )
{
result.base_volume += t.value;
result.quote_volume += t.amount;
}
}
trades = get_trade_history( base, quote, trades.back().date, fc::time_point_sec(), 1 );
result.percent_change = trades.size() > 0 ? ( ( result.latest / trades.back().price ) - 1 ) * 100 : 0;
} }
trades = get_trade_history( base, quote, trades.back().date, fc::time_point_sec(), 1 ); auto orders = get_order_book( base, quote, 1 );
result.percent_change = trades.size() > 0 ? ( ( result.latest / trades.back().price ) - 1 ) * 100 : 0; if( orders.asks.size() )
//if (assets[0]->id == base_id)
{
result.lowest_ask = orders.asks[0].price; result.lowest_ask = orders.asks[0].price;
if( orders.bids.size() )
result.highest_bid = orders.bids[0].price; result.highest_bid = orders.bids[0].price;
}
return result;
} FC_CAPTURE_AND_RETHROW( (base)(quote) ) } FC_CAPTURE_AND_RETHROW( (base)(quote) )
return result;
} }
market_volume database_api::get_24_volume( const string& base, const string& quote )const market_volume database_api::get_24_volume( const string& base, const string& quote )const