Hoist the state override struct definition into the State class.

Author: dhil

category/execution/ethereum/state3/state.cpp

@@ -100,6 +100,61 @@ State::State(
 {
 }
 
+State::State(
+    BlockState &block_state, Incarnation const incarnation,
+    bool const relaxed_validation, Overrides const &state_overrides)
+    : block_state_{block_state}
+    , incarnation_{incarnation}
+    , relaxed_validation_{relaxed_validation}
+{
+    for (auto const &[address, state_delta] : state_overrides) {
+        OriginalAccountState &original_account_state =
+            this->original_account_state(address);
+        if (!original_account_state.account_.has_value()) {
+            original_account_state.account_ =
+                Account{.incarnation = incarnation};
+        }
+        Account &account = original_account_state.account_.value();
+
+        if (state_delta.balance.has_value()) {
+            account.balance = state_delta.balance.value();
+        }
+
+        if (state_delta.nonce.has_value()) {
+            account.nonce = state_delta.nonce.value();
+        }
+
+        if (state_delta.code.has_value()) {
+            auto const code = state_delta.code.value();
+            auto const code_hash = to_bytes(keccak256(code));
+            code_[code_hash] = block_state_.vm().try_insert_varcode(
+                code_hash, vm::make_shared_intercode(code));
+            account.code_hash = code_hash;
+        }
+
+        auto const update_state =
+            [&](std::map<bytes32_t, bytes32_t> const &diff) {
+                for (auto const &[key, value] : diff) {
+                    (void)original_account_state.set_storage(
+                        key, value, bytes32_t{});
+                }
+            };
+
+        // Remove single storage
+        if (!state_delta.state_diff.empty()) {
+            // we need to access the account first before accessing its
+            // storage
+            update_state(state_delta.state_diff);
+        }
+
+        // Remove all override
+        if (!state_delta.state.empty()) {
+            account.incarnation = incarnation;
+            update_state(state_delta.state);
+        }
+    }
+}
+
 State::Map<Address, OriginalAccountState> const &State::original() const
 {
     return original_;

category/execution/ethereum/state3/state.hpp

@@ -71,64 +71,23 @@ class State
 
     std::optional<Account> &current_account(Address const &);
 
+public:
+    struct Override
+    {
+        std::optional<uint256_t> balance{std::nullopt};
+        std::optional<uint64_t> nonce{std::nullopt};
+        std::optional<byte_string> code{std::nullopt};
+        std::map<bytes32_t, bytes32_t> state{};
+        std::map<bytes32_t, bytes32_t> state_diff{};
+    };
+
+    using Overrides = std::map<Address, Override>;
+
 public:
     State(BlockState &, Incarnation, bool relaxed_validation = false);
 
-    template <typename It>
     State(
-        BlockState &block_state, Incarnation incarnation,
-        bool relaxed_validation, It const state_overrides)
-        : block_state_{block_state}
-        , incarnation_{incarnation}
-        , relaxed_validation_{relaxed_validation}
-    {
-        for (auto const &[address, state_delta] : state_overrides) {
-            OriginalAccountState &original_account_state =
-                this->original_account_state(address);
-            if (!original_account_state.account_.has_value()) {
-                original_account_state.account_ =
-                    Account{.incarnation = incarnation};
-            }
-            Account &account = original_account_state.account_.value();
-
-            if (state_delta.balance.has_value()) {
-                account.balance = state_delta.balance.value();
-            }
-
-            if (state_delta.nonce.has_value()) {
-                account.nonce = state_delta.nonce.value();
-            }
-
-            if (state_delta.code.has_value()) {
-                auto const code = state_delta.code.value();
-                auto const code_hash = to_bytes(keccak256(code));
-                code_[code_hash] = block_state_.vm().try_insert_varcode(
-                    code_hash, vm::make_shared_intercode(code));
-                account.code_hash = code_hash;
-            }
-
-            auto const update_state =
-                [&](std::map<bytes32_t, bytes32_t> const &diff) {
-                    for (auto const &[key, value] : diff) {
-                        (void)original_account_state.set_storage(
-                            key, value, bytes32_t{});
-                    }
-                };
-
-            // Remove single storage
-            if (!state_delta.state_diff.empty()) {
-                // we need to access the account first before accessing its
-                // storage
-                update_state(state_delta.state_diff);
-            }
-
-            // Remove all override
-            if (!state_delta.state.empty()) {
-                account.incarnation = incarnation;
-                update_state(state_delta.state);
-            }
-        }
-    }
+        BlockState &, Incarnation, bool relaxed_validation, Overrides const &);
 
     State(State &&) = delete;
     State(State const &) = delete;

category/rpc/eth_call.cpp

@@ -69,16 +69,7 @@ using namespace monad::vm;
 
 struct monad_state_override
 {
-    struct monad_state_override_object
-    {
-        std::optional<uint256_t> balance{std::nullopt};
-        std::optional<uint64_t> nonce{std::nullopt};
-        std::optional<byte_string> code{std::nullopt};
-        std::map<bytes32_t, bytes32_t> state{};
-        std::map<bytes32_t, bytes32_t> state_diff{};
-    };
-
-    std::map<Address, monad_state_override_object> override_sets;
+    std::map<Address, State::Override> override_sets{};
 };
 
 namespace
@@ -90,7 +81,6 @@ namespace
         "failure to submit eth_call to thread pool: queue size exceeded";
     char const *const TIMEOUT_ERR_MSG =
         "failure to execute eth_call: queuing time exceeded timeout threshold";
-    using StateOverrideObj = monad_state_override::monad_state_override_object;
 
     template <Traits traits>
     Result<evmc::Result> eth_call_impl(
@@ -199,7 +189,7 @@ void add_override_address(
     std::memcpy(address.bytes, addr, sizeof(Address));
 
     MONAD_ASSERT(m->override_sets.find(address) == m->override_sets.end());
-    m->override_sets.emplace(address, StateOverrideObj{});
+    m->override_sets.emplace(address, State::Override{});
 }
 
 void set_override_balance(