diff --git a/libraries/chain/betting_market_evaluator.cpp b/libraries/chain/betting_market_evaluator.cpp index b2ba5f25..7a6a2816 100644 --- a/libraries/chain/betting_market_evaluator.cpp +++ b/libraries/chain/betting_market_evaluator.cpp @@ -195,6 +195,7 @@ object_id_type betting_market_create_evaluator::do_apply(const betting_market_cr const betting_market_object& new_betting_market = db().create( [&]( betting_market_object& betting_market_obj ) { betting_market_obj.group_id = group_id; + betting_market_obj.description = op.description; betting_market_obj.payout_condition = op.payout_condition; }); return new_betting_market.id; diff --git a/libraries/chain/include/graphene/chain/betting_market_object.hpp b/libraries/chain/include/graphene/chain/betting_market_object.hpp index 20b80afb..4e014762 100644 --- a/libraries/chain/include/graphene/chain/betting_market_object.hpp +++ b/libraries/chain/include/graphene/chain/betting_market_object.hpp @@ -130,7 +130,7 @@ typedef multi_index_container< betting_market_group_object, indexed_by< ordered_unique< tag, member< object, object_id_type, &object::id > >, - ordered_non_unique< tag, member > + ordered_non_unique< tag, member > > > betting_market_group_object_multi_index_type; typedef generic_index betting_market_group_object_index; @@ -138,7 +138,7 @@ typedef multi_index_container< betting_market_object, indexed_by< ordered_unique< tag, member< object, object_id_type, &object::id > >, - ordered_non_unique< tag, member< betting_market_object, betting_market_group_id_type, &betting_market_object::group_id > > + ordered_non_unique< tag, member > > > betting_market_object_multi_index_type; typedef generic_index betting_market_object_index; diff --git a/libraries/chain/include/graphene/chain/protocol/betting_market.hpp b/libraries/chain/include/graphene/chain/protocol/betting_market.hpp index 1d1e527b..b658f363 100644 --- a/libraries/chain/include/graphene/chain/protocol/betting_market.hpp +++ b/libraries/chain/include/graphene/chain/protocol/betting_market.hpp @@ -133,6 +133,8 @@ struct betting_market_create_operation : public base_operation */ object_id_type group_id; + internationalized_string_type description; + internationalized_string_type payout_condition; extensions_type extensions; @@ -379,7 +381,7 @@ FC_REFLECT( graphene::chain::betting_market_group_update_operation, FC_REFLECT( graphene::chain::betting_market_create_operation::fee_parameters_type, (fee) ) FC_REFLECT( graphene::chain::betting_market_create_operation, - (fee)(group_id)(payout_condition)(extensions) ) + (fee)(group_id)(description)(payout_condition)(extensions) ) FC_REFLECT( graphene::chain::betting_market_update_operation::fee_parameters_type, (fee) ) FC_REFLECT( graphene::chain::betting_market_update_operation, diff --git a/libraries/wallet/include/graphene/wallet/wallet.hpp b/libraries/wallet/include/graphene/wallet/wallet.hpp index 689bf1c6..108cf341 100644 --- a/libraries/wallet/include/graphene/wallet/wallet.hpp +++ b/libraries/wallet/include/graphene/wallet/wallet.hpp @@ -1660,6 +1660,7 @@ class wallet_api const string& proposing_account, fc::time_point_sec expiration_time, betting_market_group_id_type group_id, + internationalized_string_type description, internationalized_string_type payout_condition, bool broadcast = false); diff --git a/libraries/wallet/wallet.cpp b/libraries/wallet/wallet.cpp index 9f7fb385..913cfd80 100644 --- a/libraries/wallet/wallet.cpp +++ b/libraries/wallet/wallet.cpp @@ -5335,6 +5335,7 @@ signed_transaction wallet_api::propose_create_betting_market( const string& proposing_account, fc::time_point_sec expiration_time, betting_market_group_id_type group_id, + internationalized_string_type description, internationalized_string_type payout_condition, bool broadcast /*= false*/) { @@ -5343,6 +5344,7 @@ signed_transaction wallet_api::propose_create_betting_market( betting_market_create_operation betting_market_create_op; betting_market_create_op.group_id = group_id; + betting_market_create_op.description = description; betting_market_create_op.payout_condition = payout_condition; proposal_create_operation prop_op;