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

Add wallet command for whitelisting accounts.

Browse source 
Re-enable shutdown in node code which was causing some (not all) of the
errors in two_node_network test #55, and likely occasional crashes at
shutdown for the witness node
This commit is contained in:
Eric Frias 2015-06-20 18:33:58 -04:00
parent 1acb93472a
commit 1b9ca9ffe8
3 changed files with 34 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
libraries/net/node.cpp
View file

@ -4930,9 +4930,7 @@ namespace graphene { namespace net { namespace detail {
void node::close() void node::close()
{ {
wlog( ".... WARNING NOT DOING ANYTHING WHEN I SHOULD ......" ); INVOKE_IN_IMPL(close);
return;
my->close();
} }
struct simulated_network::node_info struct simulated_network::node_info

5
libraries/wallet/include/graphene/wallet/wallet.hpp
View file

@ -259,6 +259,11 @@ class wallet_api
string symbol, string symbol,
bool broadcast = false); 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); signed_transaction sign_transaction(signed_transaction tx, bool broadcast = false);
void dbg_make_uia(string creator, string symbol); void dbg_make_uia(string creator, string symbol);

30
libraries/wallet/wallet.cpp
View file

@ -1080,6 +1080,24 @@ public:
return sign_transaction( tx, broadcast ); return sign_transaction( tx, broadcast );
} FC_CAPTURE_AND_RETHROW( (account_to_settle)(amount_to_settle)(symbol)(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) signed_transaction sign_transaction(signed_transaction tx, bool broadcast = false)
{ {
flat_set<account_id_type> req_active_approvals; flat_set<account_id_type> req_active_approvals;
@ -1763,7 +1781,7 @@ signed_transaction wallet_api::global_settle_asset(string symbol,
price settle_price, price settle_price,
bool broadcast /* = false */) 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, 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, string symbol,
bool broadcast /* = false */) 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) void wallet_api::set_wallet_filename(string wallet_filename)