remove mutable accessor to state

Author: jhunsaker

category/execution/ethereum/state2/block_state.cpp

@@ -151,10 +151,10 @@ vm::SharedVarcode BlockState::read_code(bytes32_t const &code_hash)
 bool BlockState::can_merge(State &state) const
 {
     MONAD_ASSERT(state_);
-    auto &original = state.original();
+    auto const &original = state.original();
     for (auto &kv : original) {
         Address const &address = kv.first;
-        OriginalAccountState &account_state = kv.second;
+        OriginalAccountState const &account_state = kv.second;
         auto const &account = account_state.account_;
         auto const &storage = account_state.storage_;
         StateDeltas::const_accessor it{};
@@ -164,7 +164,7 @@ bool BlockState::can_merge(State &state) const
             // try to fix original and current in `state` to match the block
             // state up until this transaction
             if (!state.try_fix_account_mismatch(
-                    address, account_state, it->second.account.second)) {
+                    address, it->second.account.second)) {
                 return false;
             }
         }

category/execution/ethereum/state3/state.cpp

@@ -108,11 +108,6 @@ State::Map<Address, OriginalAccountState> const &State::original() const
     return original_;
 }
 
-State::Map<Address, OriginalAccountState> &State::original()
-{
-    return original_;
-}
-
 State::Map<Address, VersionStack<AccountState>> const &State::current() const
 {
     return current_;
@@ -622,9 +617,11 @@ void State::set_to_state_incarnation(Address const &address)
 // if original and current can be adjusted to satisfy min balance, adjust
 // both values for merge
 bool State::try_fix_account_mismatch(
-    Address const &address, OriginalAccountState &original_state,
-    std::optional<Account> const &actual)
+    Address const &address, std::optional<Account> const &actual)
 {
+    auto const original_it = original_.find(address);
+    MONAD_ASSERT(original_it != original_.end());
+    OriginalAccountState &original_state = original_it->second;
     auto &original = original_state.account_;
     // verify original used and original found are otherwise the same
     if (is_dead(original)) {
@@ -655,10 +652,10 @@ bool State::try_fix_account_mismatch(
         return false;
     }
     // adjust balances
-    auto it = current_.find(address);
-    if (it != current_.end()) {
-        MONAD_ASSERT(it->second.size() == 1);
-        auto &recent_state = it->second.recent();
+    auto const current_it = current_.find(address);
+    if (current_it != current_.end()) {
+        MONAD_ASSERT(current_it->second.size() == 1);
+        auto &recent_state = current_it->second.recent();
         auto &recent = recent_state.account_;
         if (!recent) {
             return false;

category/execution/ethereum/state3/state.hpp

@@ -89,8 +89,6 @@ class State
 
     Map<Address, OriginalAccountState> const &original() const;
 
-    Map<Address, OriginalAccountState> &original();
-
     Map<Address, VersionStack<AccountState>> const &current() const;
 
     Map<bytes32_t, vm::SharedVarcode> const &code() const;
@@ -208,8 +206,7 @@ class State
     // if original and current can be adjusted to satisfy min balance, adjust
     // both values for merge
     bool try_fix_account_mismatch(
-        Address const &, OriginalAccountState &,
-        std::optional<Account> const &actual);
+        Address const &, std::optional<Account> const &actual);
 
     /**
      * Checks whether the account currently has enough balance to cover `debit`