diff --git a/libraries/chain/include/graphene/chain/sidechain_defs.hpp b/libraries/chain/include/graphene/chain/sidechain_defs.hpp index 38723545..df2d84cd 100644 --- a/libraries/chain/include/graphene/chain/sidechain_defs.hpp +++ b/libraries/chain/include/graphene/chain/sidechain_defs.hpp @@ -1,28 +1,24 @@ #pragma once #include -#include namespace graphene { namespace chain { + enum class sidechain_type { + unknown, bitcoin, + ethereum, + eos, peerplays, - hive, - SIDECHAIN_TYPE_COUNT + hive }; -inline size_t sidechain_type_to_size_t(sidechain_type sidechain){ return static_cast(sidechain); } - -inline sidechain_type size_t_to_sidechain_type(size_t sidechain) -{ - FC_ASSERT(sidechain < static_cast(sidechain_type::SIDECHAIN_TYPE_COUNT), "Wrong sidechain_type: ${sidechain}", ("sidechain", sidechain)); - return static_cast(sidechain); -} - } } FC_REFLECT_ENUM(graphene::chain::sidechain_type, - (bitcoin) - (peerplays) - (hive) - (SIDECHAIN_TYPE_COUNT)) + (unknown) + (bitcoin) + (ethereum) + (eos) + (hive) + (peerplays) ) diff --git a/libraries/chain/include/graphene/chain/sidechain_transaction_object.hpp b/libraries/chain/include/graphene/chain/sidechain_transaction_object.hpp index f8a4f137..30a0dd5e 100644 --- a/libraries/chain/include/graphene/chain/sidechain_transaction_object.hpp +++ b/libraries/chain/include/graphene/chain/sidechain_transaction_object.hpp @@ -27,7 +27,7 @@ namespace graphene { namespace chain { static const uint8_t type_id = sidechain_transaction_object_type; time_point_sec timestamp; - sidechain_type sidechain; + sidechain_type sidechain = sidechain_type::unknown; object_id_type object_id; std::string transaction; std::vector signers; diff --git a/libraries/chain/include/graphene/chain/son_wallet_deposit_object.hpp b/libraries/chain/include/graphene/chain/son_wallet_deposit_object.hpp index 642fa094..ae68a64f 100644 --- a/libraries/chain/include/graphene/chain/son_wallet_deposit_object.hpp +++ b/libraries/chain/include/graphene/chain/son_wallet_deposit_object.hpp @@ -19,7 +19,7 @@ namespace graphene { namespace chain { time_point_sec timestamp; uint32_t block_num; - sidechain_type sidechain; + sidechain_type sidechain = sidechain_type::unknown; std::string sidechain_uid; std::string sidechain_transaction_id; std::string sidechain_from; diff --git a/libraries/chain/include/graphene/chain/son_wallet_withdraw_object.hpp b/libraries/chain/include/graphene/chain/son_wallet_withdraw_object.hpp index 822a0a66..d65f5cab 100644 --- a/libraries/chain/include/graphene/chain/son_wallet_withdraw_object.hpp +++ b/libraries/chain/include/graphene/chain/son_wallet_withdraw_object.hpp @@ -19,7 +19,7 @@ namespace graphene { namespace chain { time_point_sec timestamp; uint32_t block_num; - sidechain_type sidechain; + sidechain_type sidechain = sidechain_type::unknown; std::string peerplays_uid; std::string peerplays_transaction_id; chain::account_id_type peerplays_from;