diff --git a/.gitmodules b/.gitmodules index 5572259c..ca2fa11d 100644 --- a/.gitmodules +++ b/.gitmodules @@ -4,5 +4,5 @@ ignore = dirty [submodule "libraries/fc"] path = libraries/fc - url = https://github.com/PBSA/peerplays-fc.git + url = https://github.com/peerplays-network/peerplays-fc.git ignore = dirty diff --git a/libraries/chain/include/graphene/chain/protocol/asset_ops.hpp b/libraries/chain/include/graphene/chain/protocol/asset_ops.hpp index 49096e1d..ce6ef3af 100644 --- a/libraries/chain/include/graphene/chain/protocol/asset_ops.hpp +++ b/libraries/chain/include/graphene/chain/protocol/asset_ops.hpp @@ -661,7 +661,7 @@ FC_REFLECT( graphene::chain::benefactor, (id)(share) ) FC_REFLECT( graphene::chain::lottery_asset_options, (benefactors)(owner)(winning_tickets)(ticket_price)(end_date)(ending_on_soldout)(is_active) ) -FC_REFLECT( graphene::chain::asset_create_operation::fee_parameters_type, (symbol3)(symbol4)(long_symbol)(price_per_kbyte) ) +FC_REFLECT( graphene::chain::asset_create_operation::fee_parameters_type, (symbol3)(symbol4)(long_symbol)(lottery_asset)(price_per_kbyte) ) FC_REFLECT( graphene::chain::asset_global_settle_operation::fee_parameters_type, (fee) ) FC_REFLECT( graphene::chain::asset_settle_operation::fee_parameters_type, (fee) ) FC_REFLECT( graphene::chain::asset_settle_cancel_operation::fee_parameters_type, ) diff --git a/libraries/chain/include/graphene/chain/protocol/chain_parameters.hpp b/libraries/chain/include/graphene/chain/protocol/chain_parameters.hpp index d14aa200..cf6de338 100644 --- a/libraries/chain/include/graphene/chain/protocol/chain_parameters.hpp +++ b/libraries/chain/include/graphene/chain/protocol/chain_parameters.hpp @@ -125,7 +125,7 @@ namespace graphene { namespace chain { } } // graphene::chain -FC_REFLECT( graphene::chain::parameter_extension, +FC_REFLECT( graphene::chain::bet_parameter_extension, (min_bet_multiplier) (max_bet_multiplier) (betting_rake_fee_percentage)