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

Merge branch 'betting-merge' of https://bitbucket.org/peerplaysblockchain/peerplays-graphene into betting-merge

Browse source
This commit is contained in:
Roman Olearski 2017-07-24 21:00:34 +02:00
commit f1a0c3de66
2 changed files with 39 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -1623,11 +1623,19 @@ class wallet_api
fc::optional<time_point_sec> start_time,
bool broadcast = false);
signed_transaction propose_create_betting_market_rules(
const string& proposing_account,
fc::time_point_sec expiration_time,
internationalized_string_type name,
internationalized_string_type description,
bool broadcast = false);
signed_transaction propose_create_betting_market_group(
const string& proposing_account,
fc::time_point_sec expiration_time,
internationalized_string_type description,
event_id_type event_id,
betting_market_rules_id_type rules_id,
asset_id_type asset_id,
bool broadcast = false);

31
libraries/wallet/wallet.cpp
View file

@ -5205,11 +5205,41 @@ signed_transaction wallet_api::propose_update_event(
}
signed_transaction wallet_api::propose_create_betting_market_rules(
const string& proposing_account,
fc::time_point_sec expiration_time,
internationalized_string_type name,
internationalized_string_type description,
bool broadcast /*= false*/)
{
FC_ASSERT( !is_locked() );
const chain_parameters& current_params = get_global_properties().parameters;
betting_market_rules_create_operation betting_market_rules_create_op;
betting_market_rules_create_op.name = name;
betting_market_rules_create_op.description = description;
proposal_create_operation prop_op;
prop_op.expiration_time = expiration_time;
prop_op.review_period_seconds = current_params.committee_proposal_review_period;
prop_op.fee_paying_account = get_account(proposing_account).id;
prop_op.proposed_ops.emplace_back( betting_market_rules_create_op );
current_params.current_fees->set_fee( prop_op.proposed_ops.back().op );
signed_transaction tx;
tx.operations.push_back(prop_op);
my->set_operation_fees(tx, current_params.current_fees);
tx.validate();
return my->sign_transaction(tx, broadcast);
}
signed_transaction wallet_api::propose_create_betting_market_group(
const string& proposing_account,
fc::time_point_sec expiration_time,
internationalized_string_type description,
event_id_type event_id,
betting_market_rules_id_type rules_id,
asset_id_type asset_id,
bool broadcast /*= false*/)
{
@ -5219,6 +5249,7 @@ signed_transaction wallet_api::propose_create_betting_market_group(
betting_market_group_create_operation betting_market_group_create_op;
betting_market_group_create_op.description = description;
betting_market_group_create_op.event_id = event_id;
betting_market_group_create_op.rules_id = rules_id;
betting_market_group_create_op.asset_id = asset_id;
proposal_create_operation prop_op;