fix nested modify() UB related to updating RC mana (indirect nested modify)

Author: ABW

libraries/chain/database.cpp

@@ -1015,6 +1015,8 @@ VEST_asset database::adjust_account_vesting_balance(const account_object& to_acc
 
     VEST_asset new_vesting = new_vest_balance.as_asset();
     before_vesting_callback( new_vesting );
+    if( !is_reward && has_hardfork( HIVE_HARDFORK_0_20 ) )
+      rc().regenerate_rc_mana( to_account, _now );
     modify( to_account, [&]( account_object& a )
     {
       if( is_reward )
@@ -1025,15 +1027,12 @@ VEST_asset database::adjust_account_vesting_balance(const account_object& to_acc
       else
       {
         if( has_hardfork( HIVE_HARDFORK_0_20 ) )
-        {
           util::update_manabar( cprops, a, new_vesting.get_amount() );
-          rc().regenerate_rc_mana( a, _now );
-        }
         a.access_vesting().transfer_from( new_vest_balance );
-        if( has_hardfork( HIVE_HARDFORK_0_20 ) )
-          rc().update_account_after_vest_change( a, _now );
       }
     } );
+    if( !is_reward && has_hardfork( HIVE_HARDFORK_0_20 ) )
+      rc().update_account_after_vest_change( to_account, _now );
 
     return new_vesting;
   }
@@ -1573,9 +1572,8 @@ void database::clear_account( const account_object& account )
         a.delayed_votes.clear();
         a.sum_delayed_votes = 0;
       }
-
-      rc().update_account_after_vest_change( account, now, true, true );
     } );
+    rc().update_account_after_vest_change( account, now, true, true );
 
     temp_HIVE_balance hive_from_vests;
     modify( cprops, [&]( dynamic_global_property_object& o )
@@ -3142,16 +3140,14 @@ void database::clear_expired_delegations()
     try{
     pre_push_virtual_operation( *this, vop );
 
+    if( has_hardfork( HIVE_HARDFORK_0_20 ) )
+      rc().regenerate_rc_mana( delegator, now );
     modify( delegator, [&]( account_object& a )
     {
       if( has_hardfork( HIVE_HARDFORK_0_20 ) )
-      {
         util::update_manabar( gpo, a, itr->get_vesting().amount.value );
-        rc().regenerate_rc_mana( a, now );
-      }
-
       a.access_delegated_vesting() -= itr->get_vesting();
-    });
+    } );
     if( has_hardfork( HIVE_HARDFORK_0_20 ) )
       rc().update_account_after_vest_change( delegator, now );
 

libraries/chain/database_vesting.cpp

@@ -196,31 +196,30 @@ void database::process_vesting_withdrawals()
 
             pre_push_virtual_operation( *this, vop );
 
+            if( auto_vest_mode && has_hardfork( HIVE_HARDFORK_0_20 ) )
+              rc().regenerate_rc_mana( to_account, now );
             modify( to_account, [&]( account_object& a )
             {
               if( auto_vest_mode )
-              {
-                if( has_hardfork( HIVE_HARDFORK_0_20 ) )
-                  rc().regenerate_rc_mana( a, now );
                 a.access_vesting().transfer_from( routed_vest_balance );
-                if( has_hardfork( HIVE_HARDFORK_0_20 ) )
-                  rc().update_account_after_vest_change( a, now );
-
-                if( has_hardfork( HIVE_HARDFORK_1_24 ) )
-                {
-                  FC_ASSERT( dv.valid(), "The object processing `delayed votes` must exist" );
-                  dv->add_votes( _votes_update_data_items, to_self, routed_vests.amount, a );
-                }
-                else
-                {
-                  adjust_proxied_witness_votes( a, routed_vests.amount );
-                }
+              else
+                a.access_hive_balance().transfer_from( routed_hive_balance );
+            } );
+            if( auto_vest_mode )
+            {
+              if( has_hardfork( HIVE_HARDFORK_0_20 ) )
+                rc().update_account_after_vest_change( to_account, now );
+
+              if( has_hardfork( HIVE_HARDFORK_1_24 ) )
+              {
+                FC_ASSERT( dv.valid(), "The object processing `delayed votes` must exist" );
+                dv->add_votes( _votes_update_data_items, to_self, routed_vests.amount, to_account );
               }
               else
               {
-                a.access_hive_balance().transfer_from( routed_hive_balance );
+                adjust_proxied_witness_votes( to_account, routed_vests.amount );
               }
-            } );
+            }
 
             post_push_virtual_operation( *this, vop );
           }

libraries/chain/hive_evaluator_transfer.cpp

@@ -695,15 +695,13 @@ void claim_reward_balance_evaluator::do_apply( const claim_reward_balance_operat
   _db.adjust_reward_balance( acnt, hbd_reward, -op_reward_hbd );
   _db.adjust_balance( acnt, hbd_reward, op_reward_hbd );
 
+  if( _db.has_hardfork( HIVE_HARDFORK_0_20 ) )
+    _db.rc().regenerate_rc_mana( acnt, now );
   temp_HIVE_balance reward_vesting_hive_balance;
   _db.modify( acnt, [&]( account_object& a )
   {
     if( _db.has_hardfork( HIVE_HARDFORK_0_20 ) )
-    {
       util::update_manabar( dgpo, a, op_reward_vests.amount.value );
-      _db.rc().regenerate_rc_mana( a, now );
-    }
-
     a.access_vesting().transfer_from( a.access_vest_rewards(), op_reward_vests );
     reward_vesting_hive_balance.transfer_from( a.access_vest_rewards_as_hive(), reward_vesting_hive_to_move );
   } );