From 9d8278428f59dab0b2d87cb5ad45226b2c205913 Mon Sep 17 00:00:00 2001 From: gladcow Date: Sun, 12 Jan 2020 16:09:30 +0300 Subject: [PATCH] fix bug with SON activation --- libraries/chain/db_maint.cpp | 12 ++++++++++++ .../chain/include/graphene/chain/son_object.hpp | 2 +- 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/libraries/chain/db_maint.cpp b/libraries/chain/db_maint.cpp index 7b111fd4..264d6dc2 100644 --- a/libraries/chain/db_maint.cpp +++ b/libraries/chain/db_maint.cpp @@ -471,6 +471,18 @@ void database::update_active_sons() } else { ilog( "Active SONs set CHANGED" ); // Store new SON info, initiate wallet recreation and transfer of funds + for( const son_object& son : cur_active_sons ) + { + modify( son, [&]( son_object& obj ){ + obj.status = son_status::inactive; + }); + } + for( const son_object& son : new_active_sons ) + { + modify( son, [&]( son_object& obj ){ + obj.status = son_status::active; + }); + } } modify(gpo, [&]( global_property_object& gp ){ diff --git a/libraries/chain/include/graphene/chain/son_object.hpp b/libraries/chain/include/graphene/chain/son_object.hpp index 8a876bfd..50f7385a 100644 --- a/libraries/chain/include/graphene/chain/son_object.hpp +++ b/libraries/chain/include/graphene/chain/son_object.hpp @@ -97,7 +97,7 @@ namespace graphene { namespace chain { FC_REFLECT_ENUM(graphene::chain::son_status, (inactive)(active)(in_maintenance)(deregistered) ) FC_REFLECT_DERIVED( graphene::chain::son_object, (graphene::db::object), - (son_account)(vote_id)(total_votes)(url)(deposit)(signing_key)(pay_vb)(sidechain_public_keys) ) + (son_account)(vote_id)(total_votes)(url)(deposit)(signing_key)(pay_vb)(status)(sidechain_public_keys) ) FC_REFLECT_DERIVED( graphene::chain::son_statistics_object, (graphene::db::object),