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

Merge remote-tracking branch 'remotes/origin/467-wallet-propose-account'

Browse source
This commit is contained in:
Fabian Schuh 2015-12-10 13:01:53 +01:00
commit a2ce86bf4f
2 changed files with 57 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -447,9 +447,21 @@ class wallet_api
/** /**
* @ingroup Transaction Builder API * @ingroup Transaction Builder API
*/ */
signed_transaction propose_builder_transaction(transaction_handle_type handle, signed_transaction propose_builder_transaction(
time_point_sec expiration = time_point::now() + fc::minutes(1), transaction_handle_type handle,
uint32_t review_period_seconds = 0, bool broadcast = true); time_point_sec expiration = time_point::now() + fc::minutes(1),
uint32_t review_period_seconds = 0,
bool broadcast = true
);
signed_transaction propose_builder_transaction2(
transaction_handle_type handle,
string account_name_or_id,
time_point_sec expiration = time_point::now() + fc::minutes(1),
uint32_t review_period_seconds = 0,
bool broadcast = true
);
/** /**
* @ingroup Transaction Builder API * @ingroup Transaction Builder API
*/ */
@ -1483,6 +1495,7 @@ FC_API( graphene::wallet::wallet_api,
(preview_builder_transaction) (preview_builder_transaction)
(sign_builder_transaction) (sign_builder_transaction)
(propose_builder_transaction) (propose_builder_transaction)
(propose_builder_transaction2)
(remove_builder_transaction) (remove_builder_transaction)
(is_new) (is_new)
(is_locked) (is_locked)

45
libraries/wallet/wallet.cpp
View file

@ -862,9 +862,10 @@ public:
return _builder_transactions[transaction_handle] = sign_transaction(_builder_transactions[transaction_handle], broadcast); return _builder_transactions[transaction_handle] = sign_transaction(_builder_transactions[transaction_handle], broadcast);
} }
signed_transaction propose_builder_transaction(transaction_handle_type handle, signed_transaction propose_builder_transaction(
time_point_sec expiration = time_point::now() + fc::minutes(1), transaction_handle_type handle,
uint32_t review_period_seconds = 0, bool broadcast = true) time_point_sec expiration = time_point::now() + fc::minutes(1),
uint32_t review_period_seconds = 0, bool broadcast = true)
{ {
FC_ASSERT(_builder_transactions.count(handle)); FC_ASSERT(_builder_transactions.count(handle));
proposal_create_operation op; proposal_create_operation op;
@ -879,6 +880,28 @@ public:
return trx = sign_transaction(trx, broadcast); return trx = sign_transaction(trx, broadcast);
} }
signed_transaction propose_builder_transaction2(
transaction_handle_type handle,
string account_name_or_id,
time_point_sec expiration = time_point::now() + fc::minutes(1),
uint32_t review_period_seconds = 0, bool broadcast = true)
{
FC_ASSERT(_builder_transactions.count(handle));
proposal_create_operation op;
op.fee_paying_account = get_account(account_name_or_id).get_id();
op.expiration_time = expiration;
signed_transaction& trx = _builder_transactions[handle];
std::transform(trx.operations.begin(), trx.operations.end(), std::back_inserter(op.proposed_ops),
[](const operation& op) -> op_wrapper { return op; });
if( review_period_seconds )
op.review_period_seconds = review_period_seconds;
trx.operations = {op};
_remote_db->get_global_properties().parameters.current_fees->set_fee( trx.operations.front() );
return trx = sign_transaction(trx, broadcast);
}
void remove_builder_transaction(transaction_handle_type handle) void remove_builder_transaction(transaction_handle_type handle)
{ {
_builder_transactions.erase(handle); _builder_transactions.erase(handle);
@ -2726,11 +2749,25 @@ signed_transaction wallet_api::sign_builder_transaction(transaction_handle_type
return my->sign_builder_transaction(transaction_handle, broadcast); return my->sign_builder_transaction(transaction_handle, broadcast);
} }
signed_transaction wallet_api::propose_builder_transaction(transaction_handle_type handle, time_point_sec expiration, uint32_t review_period_seconds, bool broadcast) signed_transaction wallet_api::propose_builder_transaction(
transaction_handle_type handle,
time_point_sec expiration,
uint32_t review_period_seconds,
bool broadcast)
{ {
return my->propose_builder_transaction(handle, expiration, review_period_seconds, broadcast); return my->propose_builder_transaction(handle, expiration, review_period_seconds, broadcast);
} }
signed_transaction wallet_api::propose_builder_transaction2(
transaction_handle_type handle,
string account_name_or_id,
time_point_sec expiration,
uint32_t review_period_seconds,
bool broadcast)
{
return my->propose_builder_transaction2(handle, account_name_or_id, expiration, review_period_seconds, broadcast);
}
void wallet_api::remove_builder_transaction(transaction_handle_type handle) void wallet_api::remove_builder_transaction(transaction_handle_type handle)
{ {
return my->remove_builder_transaction(handle); return my->remove_builder_transaction(handle);