diff --git a/libraries/app/database_api.cpp b/libraries/app/database_api.cpp index fb116ec3..46fcc83a 100644 --- a/libraries/app/database_api.cpp +++ b/libraries/app/database_api.cpp @@ -31,6 +31,8 @@ #include #include +#include +#include #include @@ -1090,56 +1092,37 @@ market_ticker database_api_impl::get_ticker( const string& base, const string& q try { if( base_id > quote_id ) std::swap(base_id, quote_id); - const auto& bidx = _db.get_index_type(); - const auto& by_key_idx = bidx.indices().get(); - uint32_t bucket_size = 86400; + uint32_t day = 86400; auto now = fc::time_point_sec( fc::time_point::now() ); - - auto itr = by_key_idx.lower_bound( bucket_key( base_id, quote_id, bucket_size, - now - bucket_size ) ); - 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 ); - if( itr != by_key_idx.end() && itr->key.base == base_id && itr->key.quote == quote_id && itr->key.seconds == bucket_size ) + result.latest = trades[0].price; + + for ( market_trade t: trades ) { - auto trades = get_trade_history( base, quote, now, fc::time_point_sec( now.sec_since_epoch() - bucket_size ), 100 ); + result.base_volume += t.value; + result.quote_volume += t.amount; + } - if (assets[0]->id == base_id) - { - result.latest = trades[0].price; - result.percent_change = ( result.latest / ( price_to_real( itr->open_quote, assets[1]->precision ) / price_to_real( itr->open_base, assets[0]->precision ) ) - 1 ) * 100; - //result.lowest_ask = price_to_real( itr->low_quote, assets[1]->precision ) / price_to_real( itr->low_base, assets[0]->precision ); - //result.highest_bid = price_to_real( itr->high_quote, assets[1]->precision ) / price_to_real( itr->high_base, assets[0]->precision ); - result.lowest_ask = orders.asks[0].first; - result.highest_bid = orders.bids[0].first; - } - else - { - result.latest = trades[0].price; - result.percent_change = ( result.latest / ( price_to_real( itr->open_base, assets[1]->precision ) / price_to_real( itr->open_quote, assets[0]->precision ) ) - 1) * 100; - //result.lowest_ask = price_to_real( itr->low_base, assets[1]->precision ) / price_to_real( itr->low_quote, assets[0]->precision ); - //result.highest_bid = price_to_real( itr->high_base, assets[1]->precision ) / price_to_real( itr->high_quote, assets[0]->precision ); - result.lowest_ask = orders.bids[0].first; - result.highest_bid = orders.asks[0].first; - } + 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.amount; - result.quote_volume += t.value; + result.base_volume += t.value; + result.quote_volume += t.amount; } + } - while (trades.size() == 100) - { - for ( market_trade t: trades ) - { - result.base_volume += t.amount; - result.quote_volume += t.value; - } - - trades = get_trade_history( base, quote, trades[99].date, fc::time_point_sec( now.sec_since_epoch() - bucket_size ), 100 ); - } + 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; + //if (assets[0]->id == base_id) + { + result.lowest_ask = orders.asks[0].price; + result.highest_bid = orders.bids[0].price; } return result; @@ -1176,19 +1159,19 @@ market_volume database_api_impl::get_24_volume( const string& base, const string for ( market_trade t: trades ) { - result.base_volume += t.amount; - result.quote_volume += t.value; + result.base_volume += t.value; + 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() - bucket_size ), 100 ); + for ( market_trade t: trades ) { - result.base_volume += t.amount; - result.quote_volume += t.value; + result.base_volume += t.value; + result.quote_volume += t.amount; } - - trades = get_trade_history( base, quote, trades[99].date, fc::time_point_sec( now.sec_since_epoch() - bucket_size ), 100 ); } return result; @@ -1202,6 +1185,7 @@ order_book database_api::get_order_book( const string& base, const string& quote order_book database_api_impl::get_order_book( const string& base, const string& quote, unsigned limit )const { + using boost::multiprecision::uint128_t; FC_ASSERT( limit <= 50 ); order_book result; @@ -1221,21 +1205,28 @@ order_book database_api_impl::get_order_book( const string& base, const string& auto price_to_real = [&]( const price& p ) { if( p.base.asset_id == base_id ) - return asset_to_real( p.quote, assets[1]->precision ) / asset_to_real( p.base, assets[0]->precision ); + return asset_to_real( p.base, assets[0]->precision ) / asset_to_real( p.quote, assets[1]->precision ); else - return asset_to_real( p.base, assets[1]->precision ) / asset_to_real( p.quote, assets[0]->precision ); + return asset_to_real( p.quote, assets[0]->precision ) / asset_to_real( p.base, assets[1]->precision ); }; - for( const auto& o : orders ) { + for( const auto& o : orders ) + { if( o.sell_price.base.asset_id == base_id ) { - result.asks.push_back( std::make_pair( price_to_real(o.sell_price), - asset_to_real(o.sell_price.base, assets[0]->precision)) ); + order ord; + ord.price = price_to_real( o.sell_price ); + ord.quote = asset_to_real( share_type( ( uint128_t( o.for_sale.value ) * o.sell_price.quote.amount.value ) / o.sell_price.base.amount.value ), assets[1]->precision ); + ord.base = asset_to_real( o.for_sale, assets[0]->precision ); + result.bids.push_back( ord ); } else { - result.bids.push_back( std::make_pair( price_to_real(o.sell_price), - asset_to_real(o.sell_price.quote, assets[0]->precision ) ) ); + order ord; + ord.price = price_to_real( o.sell_price ); + ord.quote = asset_to_real( o.for_sale, assets[1]->precision ); + ord.base = asset_to_real( share_type( ( uint64_t( o.for_sale.value ) * o.sell_price.quote.amount.value ) / o.sell_price.base.amount.value ), assets[0]->precision ); + result.asks.push_back( ord ); } } @@ -1290,13 +1281,13 @@ vector database_api_impl::get_trade_history( const string& base, if( assets[0]->id == itr->op.receives.asset_id ) { - trade.amount = price_to_real( itr->op.receives.amount, assets[0]->precision ); - trade.value = price_to_real( itr->op.pays.amount, assets[1]->precision ); + trade.amount = price_to_real( itr->op.pays.amount, assets[1]->precision ); + trade.value = price_to_real( itr->op.receives.amount, assets[0]->precision ); } else { - trade.amount = price_to_real( itr->op.pays.amount, assets[0]->precision ); - trade.value = price_to_real( itr->op.receives.amount, assets[1]->precision ); + trade.amount = price_to_real( itr->op.receives.amount, assets[1]->precision ); + trade.value = price_to_real( itr->op.pays.amount, assets[0]->precision ); } trade.date = itr->time; diff --git a/libraries/app/include/graphene/app/database_api.hpp b/libraries/app/include/graphene/app/database_api.hpp index 19d689e2..e9f91ef4 100644 --- a/libraries/app/include/graphene/app/database_api.hpp +++ b/libraries/app/include/graphene/app/database_api.hpp @@ -69,40 +69,47 @@ using namespace std; class database_api_impl; +struct order +{ + double price; + double quote; + double base; +}; + struct order_book { - string base; - string quote; - vector< pair > bids; - vector< pair > asks; + string base; + string quote; + vector< order > bids; + vector< order > asks; }; struct market_ticker { - string base; - string quote; - double latest; - double lowest_ask; - double highest_bid; - double percent_change; - double base_volume; - double quote_volume; + string base; + string quote; + double latest; + double lowest_ask; + double highest_bid; + double percent_change; + double base_volume; + double quote_volume; }; struct market_volume { - string base; - string quote; - double base_volume; - double quote_volume; + string base; + string quote; + double base_volume; + double quote_volume; }; struct market_trade { - fc::time_point_sec date; - double price; - double amount; - double value; + fc::time_point_sec date; + double price; + double amount; + double value; }; /** @@ -121,7 +128,7 @@ class database_api ///////////// // Objects // ///////////// - + /** * @brief Get the objects corresponding to the provided IDs * @param ids IDs of the objects to retrieve @@ -207,7 +214,7 @@ class database_api ////////// // Keys // ////////// - + vector> get_key_references( vector key )const; ////////////// @@ -499,9 +506,9 @@ class database_api */ map lookup_committee_member_accounts(const string& lower_bound_name, uint32_t limit)const; - - /// WORKERS - + + /// WORKERS + /** * Return the worker objects associated with this account. */ @@ -549,7 +556,7 @@ class database_api bool verify_authority( const signed_transaction& trx )const; /** - * @return true if the signers have enough authority to authorize an account + * @return true if the signers have enough authority to authorize an account */ bool verify_account_authority( const string& name_or_id, const flat_set& signers )const; @@ -587,6 +594,8 @@ class database_api }; } } + +FC_REFLECT( graphene::app::order, (price)(quote)(base) ); FC_REFLECT( graphene::app::order_book, (base)(quote)(bids)(asks) ); FC_REFLECT( graphene::app::market_ticker, (base)(quote)(latest)(lowest_ask)(highest_bid)(percent_change)(base_volume)(quote_volume) ); FC_REFLECT( graphene::app::market_volume, (base)(quote)(base_volume)(quote_volume) ); diff --git a/libraries/wallet/include/graphene/wallet/wallet.hpp b/libraries/wallet/include/graphene/wallet/wallet.hpp index db6dfd1e..45cf58db 100644 --- a/libraries/wallet/include/graphene/wallet/wallet.hpp +++ b/libraries/wallet/include/graphene/wallet/wallet.hpp @@ -851,6 +851,51 @@ class wallet_api uint32_t timeout_sec = 0, bool fill_or_kill = false, bool broadcast = false); + + /** Place a limit order attempting to sell one asset for another. + * + * This API call abstracts away some of the details of the sell_asset call to be more + * user friendly. All orders placed with sell never timeout and will not be killed if they + * cannot be filled immediately. If you wish for one of these parameters to be different, + * then sell_asset should be used instead. + * + * @param seller_account the account providing the asset being sold, and which will + * receive the processed of the sale. + * @param base The name or id of the asset to sell. + * @param quote The name or id of the asset to recieve. + * @param rate The rate in base:quote at which you want to sell. + * @param amount The amount of base you want to sell. + * @param broadcast true to broadcast the transaction on the network. + * @returns The signed transaction selling the funds. + */ + signed_transaction sell( string seller_account, + string base, + string quote, + double rate, + double amount, + bool broadcast ); + + /** Place a limit order attempting to buy one asset with another. + * + * This API call abstracts away some of the details of the sell_asset call to be more + * user friendly. All orders placed with buy never timeout and will not be killed if they + * cannot be filled immediately. If you wish for one of these parameters to be different, + * then sell_asset should be used instead. + * + * @param buyer_account The account buying the asset for another asset. + * @param base The name or id of the asset to buy. + * @param quote The name or id of the assest being offered as payment. + * @param rate The rate in base:quote at which you want to buy. + * @param amount the amount of base you want to buy. + * @param broadcast true to broadcast the transaction on the network. + * @param The signed transaction selling the funds. + */ + signed_transaction buy( string buyer_account, + string base, + string quote, + double rate, + double amount, + bool broadcast ); /** Borrow an asset or update the debt/collateral ratio for the loan. * @@ -1403,6 +1448,8 @@ class wallet_api const approval_delta& delta, bool broadcast /* = false */ ); + + order_book get_order_book( const string& base, const string& quote, unsigned limit = 50); vector list_sports() const; vector list_event_groups(sport_id_type sport_id) const; @@ -1584,6 +1631,8 @@ FC_API( graphene::wallet::wallet_api, (upgrade_account) (create_account_with_brain_key) (sell_asset) + (sell) + (buy) (borrow_asset) (cancel_order) (transfer) @@ -1669,4 +1718,5 @@ FC_API( graphene::wallet::wallet_api, (propose_create_betting_market) (place_bet) (propose_resolve_betting_market) + (get_order_book) ) diff --git a/libraries/wallet/wallet.cpp b/libraries/wallet/wallet.cpp index 359bfa01..20191320 100644 --- a/libraries/wallet/wallet.cpp +++ b/libraries/wallet/wallet.cpp @@ -280,7 +280,7 @@ private: auto iter = _wallet.pending_witness_registrations.find(witness_name); FC_ASSERT(iter != _wallet.pending_witness_registrations.end()); std::string wif_key = iter->second; - + // get the list key id this key is registered with in the chain fc::optional witness_private_key = wif_to_key(wif_key); FC_ASSERT(witness_private_key); @@ -316,12 +316,12 @@ private: if( optional_account ) claim_registered_account(*optional_account); } - + if (!_wallet.pending_witness_registrations.empty()) { // make a vector of the owner accounts for witnesses pending registration std::vector pending_witness_names = boost::copy_range >(boost::adaptors::keys(_wallet.pending_witness_registrations)); - + // look up the owners on the blockchain std::vector> owner_account_objects = _remote_db->lookup_account_names(pending_witness_names); @@ -365,9 +365,9 @@ private: // if the user executes the same command twice in quick succession, // we might generate the same transaction id, and cause the second - // transaction to be rejected. This can be avoided by altering the + // transaction to be rejected. This can be avoided by altering the // second transaction slightly (bumping up the expiration time by - // a second). Keep track of recent transaction ids we've generated + // a second). Keep track of recent transaction ids we've generated // so we can know if we need to do this struct recently_generated_transaction_record { @@ -377,7 +377,7 @@ private: struct timestamp_index{}; typedef boost::multi_index_container, std::hash >, boost::multi_index::ordered_non_unique, @@ -686,7 +686,7 @@ public: if (!optional_private_key) FC_THROW("Invalid private key"); graphene::chain::public_key_type wif_pub_key = optional_private_key->get_public_key(); - + account_object account = get_account( account_name_or_id ); // make a list of all current public keys for the named account @@ -1042,7 +1042,7 @@ public: { try { int active_key_index = find_first_unused_derived_key_index(owner_privkey); fc::ecc::private_key active_privkey = derive_private_key( key_to_wif(owner_privkey), active_key_index); - + int memo_key_index = find_first_unused_derived_key_index(active_privkey); fc::ecc::private_key memo_privkey = derive_private_key( key_to_wif(active_privkey), memo_key_index); @@ -1350,7 +1350,7 @@ public: return sign_transaction( tx, broadcast ); } FC_CAPTURE_AND_RETHROW( (authorizing_account)(account_to_list)(new_listing_status)(broadcast) ) } - signed_transaction create_committee_member(string owner_account, string url, + signed_transaction create_committee_member(string owner_account, string url, bool broadcast /* = false */) { try { @@ -1370,7 +1370,7 @@ public: witness_object get_witness(string owner_account) { - try + try { fc::optional witness_id = maybe_id(owner_account); if (witness_id) @@ -1405,7 +1405,7 @@ public: committee_member_object get_committee_member(string owner_account) { - try + try { fc::optional committee_member_id = maybe_id(owner_account); if (committee_member_id) @@ -1460,7 +1460,7 @@ public: tx.operations.push_back( witness_create_op ); set_operation_fees( tx, _remote_db->get_global_properties().parameters.current_fees); tx.validate(); - + _wallet.pending_witness_registrations[owner_account] = key_to_wif(witness_private_key); return sign_transaction( tx, broadcast ); @@ -1774,7 +1774,7 @@ public: if (account_object_to_modify.options.num_witness == desired_number_of_witnesses && account_object_to_modify.options.num_committee == desired_number_of_committee_members) - FC_THROW("Account ${account} is already voting for ${witnesses} witnesses and ${committee_members} committee_members", + FC_THROW("Account ${account} is already voting for ${witnesses} witnesses and ${committee_members} committee_members", ("account", account_to_modify)("witnesses", desired_number_of_witnesses)("committee_members",desired_number_of_witnesses)); account_object_to_modify.options.num_witness = desired_number_of_witnesses; account_object_to_modify.options.num_committee = desired_number_of_committee_members; @@ -2161,11 +2161,95 @@ public: for( auto& r : records ) { asset_object as = get_asset( r.amount.asset_id ); - ss << fc::get_approximate_relative_time_string( r.date ) + ss << fc::get_approximate_relative_time_string( r.date ) << " " << as.amount_to_pretty_string( r.amount ) << " " << r.from_label << " => " << r.to_label << " " << r.memo <<"\n"; } return ss.str(); }; + m["get_order_book"] = [this](variant result, const fc::variants& a) + { + auto orders = result.as(); + auto bids = orders.bids; + auto asks = orders.asks; + std::stringstream ss; + std::stringstream sum_stream; + sum_stream << "Sum(" << orders.base << ')'; + double bid_sum = 0; + double ask_sum = 0; + const int spacing = 20; + + auto prettify_num = [&]( double n ) + { + //ss << n; + if (abs( round( n ) - n ) < 0.00000000001 ) + { + //ss << setiosflags( !ios::fixed ) << (int) n; // doesn't compile on Linux with gcc + ss << (int) n; + } + else if (n - floor(n) < 0.000001) + { + ss << setiosflags( ios::fixed ) << setprecision(10) << n; + } + else + { + ss << setiosflags( ios::fixed ) << setprecision(6) << n; + } + }; + + ss << setprecision( 8 ) << setiosflags( ios::fixed ) << setiosflags( ios::left ); + + ss << ' ' << setw( (spacing * 4) + 6 ) << "BUY ORDERS" << "SELL ORDERS\n" + << ' ' << setw( spacing + 1 ) << "Price" << setw( spacing ) << orders.quote << ' ' << setw( spacing ) + << orders.base << ' ' << setw( spacing ) << sum_stream.str() + << " " << setw( spacing + 1 ) << "Price" << setw( spacing ) << orders.quote << ' ' << setw( spacing ) + << orders.base << ' ' << setw( spacing ) << sum_stream.str() + << "\n=====================================================================================" + << "|=====================================================================================\n"; + + for (int i = 0; i < bids.size() || i < asks.size() ; i++) + { + if ( i < bids.size() ) + { + bid_sum += bids[i].base; + ss << ' ' << setw( spacing ); + prettify_num( bids[i].price ); + ss << ' ' << setw( spacing ); + prettify_num( bids[i].quote ); + ss << ' ' << setw( spacing ); + prettify_num( bids[i].base ); + ss << ' ' << setw( spacing ); + prettify_num( bid_sum ); + ss << ' '; + } + else + { + ss << setw( (spacing * 4) + 5 ) << ' '; + } + + ss << '|'; + + if ( i < asks.size() ) + { + ask_sum += asks[i].base; + ss << ' ' << setw( spacing ); + prettify_num( asks[i].price ); + ss << ' ' << setw( spacing ); + prettify_num( asks[i].quote ); + ss << ' ' << setw( spacing ); + prettify_num( asks[i].base ); + ss << ' ' << setw( spacing ); + prettify_num( ask_sum ); + } + + ss << '\n'; + } + + ss << endl + << "Buy Total: " << bid_sum << ' ' << orders.base << endl + << "Sell Total: " << ask_sum << ' ' << orders.base << endl; + + return ss.str(); + }; return m; } @@ -2392,7 +2476,7 @@ public: dbg_make_uia(master.name, "SHILL"); } catch(...) {/* Ignore; the asset probably already exists.*/} - fc::time_point start = fc::time_point::now(); + fc::time_point start = fc::time_point::now(); for( int i = 0; i < number_of_accounts; ++i ) { std::ostringstream brain_key; @@ -2474,7 +2558,7 @@ std::string operation_printer::operator()(const T& op)const //op.get_balance_delta( acc, result ); auto a = wallet.get_asset( op.fee.asset_id ); auto payer = wallet.get_account( op.fee_payer() ); - + string op_name = fc::get_typename::name(); if( op_name.find_last_of(':') != string::npos ) op_name.erase(0, op_name.find_last_of(':')+1); @@ -2494,7 +2578,7 @@ std::string operation_printer::operator()(const transfer_from_blind_operation& o auto a = wallet.get_asset( op.fee.asset_id ); auto receiver = wallet.get_account( op.to ); - out << receiver.name + out << receiver.name << " received " << a.amount_to_pretty_string( op.amount ) << " from blinded balance"; return ""; } @@ -2504,7 +2588,7 @@ std::string operation_printer::operator()(const transfer_to_blind_operation& op) auto a = wallet.get_asset( op.amount.asset_id ); auto sender = wallet.get_account( op.from ); - out << sender.name + out << sender.name << " sent " << a.amount_to_pretty_string( op.amount ) << " to " << op.outputs.size() << " blinded balance" << (op.outputs.size()>1?"s":"") << " fee: " << fa.amount_to_pretty_string( op.fee ); return ""; @@ -2641,7 +2725,7 @@ vector wallet_api::get_account_history(string name, int limit) while( limit > 0 ) { operation_history_id_type start; - if( result.size() ) + if( result.size() ) { start = result.back().op.id; start = start + 1; @@ -3077,7 +3161,7 @@ signed_transaction wallet_api::whitelist_account(string authorizing_account, return my->whitelist_account(authorizing_account, account_to_list, new_listing_status, broadcast); } -signed_transaction wallet_api::create_committee_member(string owner_account, string url, +signed_transaction wallet_api::create_committee_member(string owner_account, string url, bool broadcast /* = false */) { return my->create_committee_member(owner_account, url, broadcast); @@ -3183,7 +3267,7 @@ signed_transaction wallet_api::set_desired_witness_and_committee_member_count(st uint16_t desired_number_of_committee_members, bool broadcast /* = false */) { - return my->set_desired_witness_and_committee_member_count(account_to_modify, desired_number_of_witnesses, + return my->set_desired_witness_and_committee_member_count(account_to_modify, desired_number_of_witnesses, desired_number_of_committee_members, broadcast); } @@ -3522,7 +3606,7 @@ vector< signed_transaction > wallet_api_impl::import_balance( string name_or_id, if( broadcast ) _remote_net_broadcast->broadcast_transaction(signed_tx); } - + return result; } FC_CAPTURE_AND_RETHROW( (name_or_id) ) } @@ -3552,6 +3636,28 @@ signed_transaction wallet_api::sell_asset(string seller_account, symbol_to_receive, expiration, fill_or_kill, broadcast); } +signed_transaction wallet_api::sell( string seller_account, + string base, + string quote, + double rate, + double amount, + bool broadcast ) +{ + return my->sell_asset( seller_account, std::to_string( amount ), base, + std::to_string( rate * amount ), quote, 0, false, broadcast ); +} + +signed_transaction wallet_api::buy( string buyer_account, + string base, + string quote, + double rate, + double amount, + bool broadcast ) +{ + return my->sell_asset( buyer_account, std::to_string( rate * amount ), quote, + std::to_string( amount ), base, 0, false, broadcast ); +} + signed_transaction wallet_api::borrow_asset(string seller_name, string amount_to_sell, string asset_symbol, string amount_of_collateral, bool broadcast) { @@ -3675,7 +3781,7 @@ vector wallet_api::get_blind_balances( string key_or_label ) } blind_confirmation wallet_api::transfer_from_blind( string from_blind_account_key_or_label, - string to_account_id_or_name, + string to_account_id_or_name, string amount_in, string symbol, bool broadcast ) @@ -3694,7 +3800,7 @@ blind_confirmation wallet_api::transfer_from_blind( string from_blind_account_ke auto conf = blind_transfer_help( from_blind_account_key_or_label, - from_blind_account_key_or_label, + from_blind_account_key_or_label, blind_in, symbol, false, true/*to_temp*/ ); FC_ASSERT( conf.outputs.size() > 0 ); @@ -3709,24 +3815,24 @@ blind_confirmation wallet_api::transfer_from_blind( string from_blind_account_ke conf.trx.operations.push_back(from_blind); ilog( "about to validate" ); conf.trx.validate(); - + if( broadcast && conf.outputs.size() == 2 ) { - + // Save the change blind_confirmation::output conf_output; blind_confirmation::output change_output = conf.outputs[0]; - + // The wallet must have a private key for confirmation.to, this is used to decrypt the memo public_key_type from_key = get_public_key(from_blind_account_key_or_label); conf_output.confirmation.to = from_key; conf_output.confirmation.one_time_key = change_output.confirmation.one_time_key; conf_output.confirmation.encrypted_memo = change_output.confirmation.encrypted_memo; conf_output.confirmation_receipt = conf_output.confirmation; - //try { + //try { receive_blind_transfer( conf_output.confirmation_receipt, from_blind_account_key_or_label, "@"+to_account.name ); //} catch ( ... ){} } - + ilog( "about to broadcast" ); conf.trx = sign_transaction( conf.trx, broadcast ); @@ -3747,7 +3853,7 @@ blind_confirmation wallet_api::blind_transfer_help( string from_key_or_label, string symbol, bool broadcast, bool to_temp ) -{ +{ blind_confirmation confirm; try { @@ -3791,7 +3897,7 @@ blind_confirmation wallet_api::blind_transfer_help( string from_key_or_label, blinding_factors.push_back( start->data.blinding_factor ); total_amount += start->amount; - if( total_amount >= amount + blind_tr.fee ) + if( total_amount >= amount + blind_tr.fee ) break; } ++start; @@ -3859,7 +3965,7 @@ blind_confirmation wallet_api::blind_transfer_help( string from_key_or_label, conf_output.decrypted_memo.amount = change; conf_output.decrypted_memo.blinding_factor = change_blind_factor; conf_output.decrypted_memo.commitment = change_out.commitment; - conf_output.decrypted_memo.check = from_secret._hash[0]; + conf_output.decrypted_memo.check = from_secret._hash[0]; conf_output.confirmation.one_time_key = one_time_key.get_public_key(); conf_output.confirmation.to = from_key; conf_output.confirmation.encrypted_memo = fc::aes_encrypt( from_secret, fc::raw::pack( conf_output.decrypted_memo ) ); @@ -3877,7 +3983,7 @@ blind_confirmation wallet_api::blind_transfer_help( string from_key_or_label, conf_output.decrypted_memo.amount = amount; conf_output.decrypted_memo.blinding_factor = blind_factor; conf_output.decrypted_memo.commitment = to_out.commitment; - conf_output.decrypted_memo.check = secret._hash[0]; + conf_output.decrypted_memo.check = secret._hash[0]; conf_output.confirmation.one_time_key = one_time_key.get_public_key(); conf_output.confirmation.to = to_key; conf_output.confirmation.encrypted_memo = fc::aes_encrypt( secret, fc::raw::pack( conf_output.decrypted_memo ) ); @@ -3887,9 +3993,9 @@ blind_confirmation wallet_api::blind_transfer_help( string from_key_or_label, confirm.outputs.push_back( conf_output ); /** commitments must be in sorted order */ - std::sort( blind_tr.outputs.begin(), blind_tr.outputs.end(), + std::sort( blind_tr.outputs.begin(), blind_tr.outputs.end(), [&]( const blind_output& a, const blind_output& b ){ return a.commitment < b.commitment; } ); - std::sort( blind_tr.inputs.begin(), blind_tr.inputs.end(), + std::sort( blind_tr.inputs.begin(), blind_tr.inputs.end(), [&]( const blind_input& a, const blind_input& b ){ return a.commitment < b.commitment; } ); confirm.trx.operations.emplace_back( std::move(blind_tr) ); @@ -3914,10 +4020,10 @@ blind_confirmation wallet_api::blind_transfer_help( string from_key_or_label, * Transfers a public balance from @from to one or more blinded balances using a * stealth transfer. */ -blind_confirmation wallet_api::transfer_to_blind( string from_account_id_or_name, +blind_confirmation wallet_api::transfer_to_blind( string from_account_id_or_name, string asset_symbol, /** map from key or label to amount */ - vector> to_amounts, + vector> to_amounts, bool broadcast ) { try { FC_ASSERT( !is_locked() ); @@ -3949,7 +4055,7 @@ blind_confirmation wallet_api::transfer_to_blind( string from_account_id_or_name auto amount = asset_obj->amount_from_string(item.second); total_amount += amount; - + fc::ecc::public_key to_pub_key = to_key; blind_output out; @@ -3965,7 +4071,7 @@ blind_confirmation wallet_api::transfer_to_blind( string from_account_id_or_name conf_output.decrypted_memo.amount = amount; conf_output.decrypted_memo.blinding_factor = blind_factor; conf_output.decrypted_memo.commitment = out.commitment; - conf_output.decrypted_memo.check = secret._hash[0]; + conf_output.decrypted_memo.check = secret._hash[0]; conf_output.confirmation.one_time_key = one_time_key.get_public_key(); conf_output.confirmation.to = to_key; conf_output.confirmation.encrypted_memo = fc::aes_encrypt( secret, fc::raw::pack( conf_output.decrypted_memo ) ); @@ -3979,7 +4085,7 @@ blind_confirmation wallet_api::transfer_to_blind( string from_account_id_or_name bop.blinding_factor = fc::ecc::blind_sum( blinding_factors, blinding_factors.size() ); /** commitments must be in sorted order */ - std::sort( bop.outputs.begin(), bop.outputs.end(), + std::sort( bop.outputs.begin(), bop.outputs.end(), [&]( const blind_output& a, const blind_output& b ){ return a.commitment < b.commitment; } ); confirm.trx.operations.push_back( bop ); @@ -4025,7 +4131,7 @@ blind_receipt wallet_api::receive_blind_transfer( string confirmation_receipt, s result.to_key = *conf.to; result.to_label = get_key_label( result.to_key ); - if( memo.from ) + if( memo.from ) { result.from_key = *memo.from; result.from_label = get_key_label( result.from_key ); @@ -4045,7 +4151,7 @@ blind_receipt wallet_api::receive_blind_transfer( string confirmation_receipt, s // confirm the amount matches the commitment (verify the blinding factor) auto commtiment_test = fc::ecc::blind( memo.blinding_factor, memo.amount.amount.value ); FC_ASSERT( fc::ecc::verify_sum( {commtiment_test}, {memo.commitment}, 0 ) ); - + blind_balance bal; bal.amount = memo.amount; bal.to = *conf.to; @@ -4063,7 +4169,7 @@ blind_receipt wallet_api::receive_blind_transfer( string confirmation_receipt, s auto child_key_itr = owner.key_auths.find( child_pubkey ); if( child_key_itr != owner.key_auths.end() ) my->_keys[child_key_itr->first] = key_to_wif( child_priv_key ); - + // my->_wallet.blinded_balances[memo.amount.asset_id][bal.to].push_back( bal ); result.date = fc::time_point::now(); @@ -4080,7 +4186,7 @@ vector wallet_api::blind_history( string key_or_account ) vector result; auto pub_key = get_public_key( key_or_account ); - if( pub_key == public_key_type() ) + if( pub_key == public_key_type() ) return vector(); for( auto& r : my->_wallet.blind_receipts ) @@ -4355,11 +4461,12 @@ signed_transaction wallet_api::propose_resolve_betting_market( return my->sign_transaction(tx, broadcast); } -// default ctor necessary for FC_REFLECT -signed_block_with_info::signed_block_with_info() +order_book wallet_api::get_order_book( const string& base, const string& quote, unsigned limit ) { + return( my->_remote_db->get_order_book( base, quote, limit ) ); } +// default ctor necessary for FC_REFLECT signed_block_with_info::signed_block_with_info( const signed_block& block ) : signed_block( block ) {