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

Merge branch 'master' into bitshares

Browse source
This commit is contained in:
Daniel Larimer 2015-10-22 10:51:00 -04:00
commit a1640abf81
2 changed files with 3 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
libraries/chain/include/graphene/chain/confidential_evaluator.hpp
View file

@ -88,4 +88,4 @@ class blind_transfer_evaluator : public evaluator<blind_transfer_evaluator>
} } // namespace graphene::chain
FC_REFLECT( graphene::chain::blinded_balance_object, (commitment)(asset_id)(owner) )
FC_REFLECT_DERIVED( graphene::chain::blinded_balance_object, (graphene::db::object), (commitment)(asset_id)(owner) )

2
libraries/chain/include/graphene/chain/protocol/types.hpp
View file

@ -168,6 +168,7 @@ namespace graphene { namespace chain {
class vesting_balance_object;
class worker_object;
class balance_object;
class blinded_balance_object;
typedef object_id< protocol_ids, account_object_type, account_object> account_id_type;
typedef object_id< protocol_ids, asset_object_type, asset_object> asset_id_type;
@ -213,6 +214,7 @@ namespace graphene { namespace chain {
typedef object_id< implementation_ids, impl_chain_property_object_type, chain_property_object> chain_property_id_type;
typedef object_id< implementation_ids, impl_witness_schedule_object_type, witness_schedule_object> witness_schedule_id_type;
typedef object_id< implementation_ids, impl_budget_record_object_type, budget_record_object > budget_record_id_type;
typedef object_id< implementation_ids, impl_blinded_balance_object_type, blinded_balance_object > blinded_balance_id_type;
typedef fc::array<char, GRAPHENE_MAX_ASSET_SYMBOL_LENGTH> symbol_type;
typedef fc::ripemd160 block_id_type;