From 8c402d2e7076e087c8d4fb9235a01546a651e06b Mon Sep 17 00:00:00 2001
From: serkixenos <serki.xenos@gmail.com>
Date: Fri, 21 Jan 2022 12:17:13 -0400
Subject: [PATCH] Fix list_active_son command output on deregistered SONs

---
 libraries/wallet/wallet.cpp | 11 +++--------
 1 file changed, 3 insertions(+), 8 deletions(-)

diff --git a/libraries/wallet/wallet.cpp b/libraries/wallet/wallet.cpp
index 68051f2e..1f38853f 100644
--- a/libraries/wallet/wallet.cpp
+++ b/libraries/wallet/wallet.cpp
@@ -2210,11 +2210,8 @@ public:
       vector<std::string> owners;
       for(auto obj: son_objects)
       {
-         if (obj)
-         {
-            std::string acc_id = account_id_to_string(obj->son_account);
-            owners.push_back(acc_id);
-         }
+         std::string acc_id = account_id_to_string(obj->son_account);
+         owners.push_back(acc_id);
       }
       vector< optional< account_object> > accs = _remote_db->get_accounts(owners);
       std::remove_if(son_objects.begin(), son_objects.end(),
@@ -2224,9 +2221,7 @@ public:
                      std::inserter(result, result.end()),
                      [](fc::optional<account_object>& acct, fc::optional<son_object> son) {
                         FC_ASSERT(acct, "Invalid active SONs list in global properties.");
-                        if (son.valid() && son->status != son_status::deregistered)
-                           return std::make_pair<string, son_id_type>(string(acct->name), std::move(son->id));
-                        return std::make_pair<string, son_id_type>(string(acct->name), std::move(son_id_type()));
+                        return std::make_pair<string, son_id_type>(string(acct->name), std::move(son->id));
                      });
       return result;
    } FC_CAPTURE_AND_RETHROW() }