diff --git a/libraries/net/node.cpp b/libraries/net/node.cpp index 998c480d..a0570f1b 100644 --- a/libraries/net/node.cpp +++ b/libraries/net/node.cpp @@ -4930,9 +4930,7 @@ namespace graphene { namespace net { namespace detail { void node::close() { - wlog( ".... WARNING NOT DOING ANYTHING WHEN I SHOULD ......" ); - return; - my->close(); + INVOKE_IN_IMPL(close); } struct simulated_network::node_info diff --git a/libraries/wallet/include/graphene/wallet/wallet.hpp b/libraries/wallet/include/graphene/wallet/wallet.hpp index 38a473ea..9507165c 100644 --- a/libraries/wallet/include/graphene/wallet/wallet.hpp +++ b/libraries/wallet/include/graphene/wallet/wallet.hpp @@ -259,6 +259,11 @@ class wallet_api string symbol, bool broadcast = false); + signed_transaction whitelist_account(string authorizing_account, + string account_to_list, + account_whitelist_operation::account_listing new_listing_status, + bool broadcast = false); + signed_transaction sign_transaction(signed_transaction tx, bool broadcast = false); void dbg_make_uia(string creator, string symbol); diff --git a/libraries/wallet/wallet.cpp b/libraries/wallet/wallet.cpp index 3060b725..0c4e129b 100644 --- a/libraries/wallet/wallet.cpp +++ b/libraries/wallet/wallet.cpp @@ -1080,6 +1080,24 @@ public: return sign_transaction( tx, broadcast ); } FC_CAPTURE_AND_RETHROW( (account_to_settle)(amount_to_settle)(symbol)(broadcast) ) } + signed_transaction whitelist_account(string authorizing_account, + string account_to_list, + account_whitelist_operation::account_listing new_listing_status, + bool broadcast /* = false */) + { try { + account_whitelist_operation whitelist_op; + whitelist_op.authorizing_account = get_account_id(authorizing_account); + whitelist_op.account_to_list = get_account_id(account_to_list); + whitelist_op.new_listing = new_listing_status; + + signed_transaction tx; + tx.operations.push_back( whitelist_op ); + tx.visit( operation_set_fee( _remote_db->get_global_properties().parameters.current_fees ) ); + tx.validate(); + + return sign_transaction( tx, broadcast ); + } FC_CAPTURE_AND_RETHROW( (authorizing_account)(account_to_list)(new_listing_status)(broadcast) ) } + signed_transaction sign_transaction(signed_transaction tx, bool broadcast = false) { flat_set req_active_approvals; @@ -1763,7 +1781,7 @@ signed_transaction wallet_api::global_settle_asset(string symbol, price settle_price, bool broadcast /* = false */) { - return global_settle_asset(symbol, settle_price, broadcast); + return my->global_settle_asset(symbol, settle_price, broadcast); } signed_transaction wallet_api::settle_asset(string account_to_settle, @@ -1771,7 +1789,15 @@ signed_transaction wallet_api::settle_asset(string account_to_settle, string symbol, bool broadcast /* = false */) { - return settle_asset(account_to_settle, amount_to_settle, symbol); + return my->settle_asset(account_to_settle, amount_to_settle, symbol, broadcast); +} + +signed_transaction wallet_api::whitelist_account(string authorizing_account, + string account_to_list, + account_whitelist_operation::account_listing new_listing_status, + bool broadcast /* = false */) +{ + return my->whitelist_account(authorizing_account, account_to_list, new_listing_status, broadcast); } void wallet_api::set_wallet_filename(string wallet_filename)