-
Notifications
You must be signed in to change notification settings - Fork 648
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #1970 from bitshares/release
Merge release branch to master for 3.3.0
- Loading branch information
Showing
105 changed files
with
4,220 additions
and
1,709 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,13 @@ | ||
| macro(add_flag_append _VAR_NAME _FLAG) | ||
| set(${_VAR_NAME} "${${_VAR_NAME}} ${_FLAG}") | ||
| endmacro(add_flag_append _VAR_NAME _FLAG) | ||
|
|
||
| macro(add_linker_flag _FLAG) | ||
| #executables | ||
| add_flag_append(CMAKE_C_LINK_FLAGS "-Wl,${_FLAG}") | ||
| add_flag_append(CMAKE_CXX_LINK_FLAGS "-Wl,${_FLAG}") | ||
| #libraries | ||
| add_flag_append(CMAKE_SHARED_LIBRARY_C_FLAGS "-Wl,${_FLAG}") | ||
| add_flag_append(CMAKE_SHARED_LIBRARY_CXX_FLAGS "-Wl,${_FLAG}") | ||
| endmacro(add_linker_flag _FLAG) | ||
|
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,91 @@ | ||
| /* | ||
| * Copyright (c) 2017 Cryptonomex, Inc., and contributors. | ||
| * | ||
| * The MIT License | ||
| * | ||
| * Permission is hereby granted, free of charge, to any person obtaining a copy | ||
| * of this software and associated documentation files (the "Software"), to deal | ||
| * in the Software without restriction, including without limitation the rights | ||
| * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell | ||
| * copies of the Software, and to permit persons to whom the Software is | ||
| * furnished to do so, subject to the following conditions: | ||
| * | ||
| * The above copyright notice and this permission notice shall be included in | ||
| * all copies or substantial portions of the Software. | ||
| * | ||
| * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR | ||
| * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, | ||
| * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE | ||
| * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER | ||
| * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, | ||
| * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN | ||
| * THE SOFTWARE. | ||
| */ | ||
|
|
||
| #include <graphene/app/api_objects.hpp> | ||
| #include <graphene/app/util.hpp> | ||
|
|
||
| namespace graphene { namespace app { | ||
|
|
||
| market_ticker::market_ticker(const market_ticker_object& mto, | ||
| const fc::time_point_sec& now, | ||
| const asset_object& asset_base, | ||
| const asset_object& asset_quote, | ||
| const order_book& orders) | ||
| { | ||
| time = now; | ||
| base = asset_base.symbol; | ||
| quote = asset_quote.symbol; | ||
| percent_change = "0"; | ||
| lowest_ask = "0"; | ||
| highest_bid = "0"; | ||
|
|
||
| fc::uint128_t bv; | ||
| fc::uint128_t qv; | ||
| price latest_price = asset( mto.latest_base, mto.base ) / asset( mto.latest_quote, mto.quote ); | ||
| if( mto.base != asset_base.id ) | ||
| latest_price = ~latest_price; | ||
| latest = price_to_string( latest_price, asset_base, asset_quote ); | ||
| if( mto.last_day_base != 0 && mto.last_day_quote != 0 // has trade data before 24 hours | ||
| && ( mto.last_day_base != mto.latest_base || mto.last_day_quote != mto.latest_quote ) ) // price changed | ||
| { | ||
| price last_day_price = asset( mto.last_day_base, mto.base ) / asset( mto.last_day_quote, mto.quote ); | ||
| if( mto.base != asset_base.id ) | ||
| last_day_price = ~last_day_price; | ||
| percent_change = price_diff_percent_string( last_day_price, latest_price ); | ||
| } | ||
| if( asset_base.id == mto.base ) | ||
| { | ||
| bv = mto.base_volume; | ||
| qv = mto.quote_volume; | ||
| } | ||
| else | ||
| { | ||
| bv = mto.quote_volume; | ||
| qv = mto.base_volume; | ||
| } | ||
| base_volume = uint128_amount_to_string( bv, asset_base.precision ); | ||
| quote_volume = uint128_amount_to_string( qv, asset_quote.precision ); | ||
|
|
||
| if(!orders.asks.empty()) | ||
| lowest_ask = orders.asks[0].price; | ||
| if(!orders.bids.empty()) | ||
| highest_bid = orders.bids[0].price; | ||
| } | ||
|
|
||
| market_ticker::market_ticker(const fc::time_point_sec& now, | ||
| const asset_object& asset_base, | ||
| const asset_object& asset_quote) | ||
| { | ||
| time = now; | ||
| base = asset_base.symbol; | ||
| quote = asset_quote.symbol; | ||
| latest = "0"; | ||
| lowest_ask = "0"; | ||
| highest_bid = "0"; | ||
| percent_change = "0"; | ||
| base_volume = "0"; | ||
| quote_volume = "0"; | ||
| } | ||
|
|
||
| } } // graphene::app |
Oops, something went wrong.