Mariusz Trela · Bartek Wrona
--- a/libraries/chain/util/hf23_helper.cpp 0 → 100644
+++ b/libraries/chain/util/hf23_helper.cpp 0 → 100644
+         const fc::variants& items = obj.get_array();
+         for( auto& item : items )
+            res.emplace_back( from_variant( item ) );
+      }
+   }
+   catch ( const std::exception& e )
+   {
+      elog( "Error while dump reading: ${e}", ("e", e.what()) );
+   }
+   catch ( const fc::exception& e )
+   {
+      elog( "Error while dump reading: ${e}", ("e", e.what()) );
+   }
+   catch (...)
+   {
+      elog( "Error while writing dump data to file ${filename}",
--- a/libraries/chain/include/steem/chain/util/hf23_helper.hpp 0 → 100644
+++ b/libraries/chain/include/steem/chain/util/hf23_helper.hpp 0 → 100644
+namespace steem { namespace chain {
+
+class hf23_helper
+{
+   public:
+
+      struct hf23_item
+      {
+         std::string name;
+
+         asset       balance;
+         asset       sbd_balance;
+
+         bool operator == ( const hf23_item& obj ) const
+         {
+            return balance == obj.balance && sbd_balance == obj.sbd_balance;
--- a/libraries/chain/include/steem/chain/util/hf23_helper.hpp 0 → 100644
+++ b/libraries/chain/include/steem/chain/util/hf23_helper.hpp 0 → 100644
+   public:
+
+      struct hf23_item
+      {
+         std::string name;
+
+         asset       balance;
+         asset       sbd_balance;
+
+         bool operator == ( const hf23_item& obj ) const
+         {
+            return balance == obj.balance && sbd_balance == obj.sbd_balance;
+         }
+
+         static hf23_item get_balances( const account_object& obj )
+         {
--- a/libraries/chain/database.cpp
+++ b/libraries/chain/database.cpp
+   auto zero_sbd = asset( 0 , SBD_SYMBOL );
+
+   for( auto& name : restored_accounts )
+   {
+      auto found = balances.find( hf23_helper::hf23_item{ name, zero_steem, zero_sbd } );
+
+      if( found == balances.end() )
+         continue;
+
+      const auto* account_ptr = find_account( name );
+      if( account_ptr == nullptr )
+         continue;
+
+      modify( *account_ptr, [&]( account_object& a )
+      {
+         a.sbd_balance = found->sbd_balance;
--- a/libraries/chain/database.cpp
+++ b/libraries/chain/database.cpp
+      if( found == balances.end() )
+      {
+         ilog( "The account ${acc} hadn't removed balances, balances can't be restored", ( "acc", name ) );
+         continue;
+      }
+
+      const auto* account_ptr = find_account( name );
+      if( account_ptr == nullptr )
+      {
+         ilog( "The account ${acc} doesn't exist at all, balances can't be restored", ( "acc", name ) );
+         continue;
+      }
+
+      FC_ASSERT( treasury_account.sbd_balance >= found->sbd_balance, "The treasury account has ${treasury_asset} but ${req_asset} is required",
+                                                                     ( "treasury_asset", treasury_account.sbd_balance )( "req_asset", found->sbd_balance ) );
+