Cram m_initcode_validity into m_initcodes

Author: gumb0

lib/evmone/execution_state.hpp

@@ -145,6 +145,11 @@ class Memory
     void clear() noexcept { m_size = 0; }
 };
 
+struct TransactionInitcode
+{
+    bytes_view code;
+    std::optional<bool> is_valid;
+};
 
 /// Generic execution state for generic instructions implementations.
 // NOLINTNEXTLINE(clang-analyzer-optin.performance.Padding)
@@ -172,8 +177,7 @@ class ExecutionState
 
 private:
     evmc_tx_context m_tx = {};
-    std::optional<std::unordered_map<evmc::bytes32, bytes_view>> m_initcodes;
-    std::unordered_map<evmc::bytes32, bool> m_initcodes_validity;
+    std::optional<std::unordered_map<evmc::bytes32, TransactionInitcode>> m_initcodes;
 
 public:
     /// Pointer to code analysis.
@@ -217,7 +221,6 @@ class ExecutionState
         deploy_container = {};
         m_tx = {};
         m_initcodes.reset();
-        m_initcodes_validity.clear();
         call_stack = {};
     }
 
@@ -242,27 +245,34 @@ class ExecutionState
             for (size_t i = 0; i < tx_context.initcodes_count; ++i)
             {
                 const auto& initcode = tx_context.initcodes[i];
-                m_initcodes->insert({initcode.hash, {initcode.code, initcode.code_size}});
+                m_initcodes->insert({initcode.hash,
+                    {.code = {initcode.code, initcode.code_size}, .is_valid = std::nullopt}});
             }
         }
 
         const auto it = m_initcodes->find(hash);
-        return it != m_initcodes->end() ? it->second : bytes_view{};
+        return it != m_initcodes->end() ? it->second.code : bytes_view{};
     }
 
     /// Get validity of initcode from transaction initcodes by its hash.
     ///
     /// Returns std::nullopt if no such initcode was validated yet.
     [[nodiscard]] std::optional<bool> get_initcode_validity(const evmc_bytes32& hash) noexcept
     {
-        const auto it = m_initcodes_validity.find(hash);
-        return (it != m_initcodes_validity.end() ? std::optional{it->second} : std::nullopt);
+        if (!m_initcodes.has_value())
+            return std::nullopt;
+
+        const auto it = m_initcodes->find(hash);
+        return (it != m_initcodes->end() ? it->second.is_valid : std::nullopt);
     }
 
     /// Set validity of initcode from transaction initcodes.
     void set_initcode_validity(const evmc_bytes32& hash, bool is_valid)
     {
-        m_initcodes_validity[hash] = is_valid;
+        if (!m_initcodes.has_value())
+            return;
+
+        (*m_initcodes)[hash].is_valid = is_valid;
     }
 };
 }  // namespace evmone