Duct-tape get_tx_initcode_by_hash() with get_initcode_validity()

Author: gumb0

lib/evmone/execution_state.hpp

@@ -236,7 +236,7 @@ class ExecutionState
     /// Get initcode by its hash from transaction initcodes.
     ///
     /// Returns empty bytes_view if no such initcode was found.
-    [[nodiscard]] bytes_view get_tx_initcode_by_hash(const evmc_bytes32& hash) noexcept
+    [[nodiscard]] TransactionInitcode get_tx_initcode_by_hash(const evmc_bytes32& hash) noexcept
     {
         if (!m_initcodes.has_value())
         {
@@ -251,26 +251,13 @@ class ExecutionState
         }
 
         const auto it = m_initcodes->find(hash);
-        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
-    {
-        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);
+        return it != m_initcodes->end() ? it->second : TransactionInitcode{};
     }
 
     /// Set validity of initcode from transaction initcodes.
     void set_initcode_validity(const evmc_bytes32& hash, bool is_valid)
     {
-        if (!m_initcodes.has_value())
-            return;
+        assert(m_initcodes.has_value());
 
         (*m_initcodes)[hash].is_valid = is_valid;
     }

lib/evmone/instructions_calls.cpp

@@ -424,16 +424,16 @@ Result create_eof_impl(
     }
     else
     {
-        initcontainer = state.get_tx_initcode_by_hash(initcode_hash);
-        // In case initcode was not found, empty bytes_view was returned.
+        const auto tx_initcode = state.get_tx_initcode_by_hash(initcode_hash);
+        // In case initcode was not found, empty tx_initcode.data was returned.
         // Transaction initcodes are not allowed to be empty.
-        if (initcontainer.empty())
+        if (tx_initcode.code.empty())
             return {EVMC_SUCCESS, gas_left};  // "Light" failure
+        initcontainer = tx_initcode.code;
 
-        const auto validity = state.get_initcode_validity(initcode_hash);
         bool is_valid = false;
-        if (validity.has_value())
-            is_valid = *validity;
+        if (tx_initcode.is_valid.has_value())
+            is_valid = *tx_initcode.is_valid;
         else
         {
             const auto error_subcont =