Disallow unreferenced subcontainers

ethereum · Jun 4, 2024 · 2414fd6 · 2414fd6
1 parent 0a3b1e0
commit 2414fd6
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 1 deletion.
diff --git a/lib/evmone/eof.cpp b/lib/evmone/eof.cpp
@@ -708,7 +708,8 @@ EOFValidationError validate_eof1(
                 return EOFValidationError::incompatible_container_kind;
         }
 
-        // TODO Validate whether subcontainer was referenced by any instruction
+        if (!referenced_by_eofcreate && !referenced_by_returncontract)
+            return EOFValidationError::unreferenced_subcontainer;
 
         // Enqueue subcontainers
         for (size_t subcont_idx = 0; subcont_idx < subcontainer_count; ++subcont_idx)
@@ -988,6 +989,8 @@ std::string_view get_error_message(EOFValidationError err) noexcept
         return "ambiguous_container_kind";
     case EOFValidationError::incompatible_container_kind:
         return "incompatible_container_kind";
+    case EOFValidationError::unreferenced_subcontainer:
+        return "unreferenced_subcontainer";
     case EOFValidationError::impossible:
         return "impossible";
     }

diff --git a/lib/evmone/eof.hpp b/lib/evmone/eof.hpp
@@ -140,6 +140,7 @@ enum class EOFValidationError
     eofcreate_with_truncated_container,
     ambiguous_container_kind,
     incompatible_container_kind,
+    unreferenced_subcontainer,
 
     impossible,
 };

diff --git a/test/unittests/eof_validation.cpp b/test/unittests/eof_validation.cpp
@@ -91,6 +91,8 @@ std::string_view get_tests_error_message(EOFValidationError err) noexcept
         return "EOF_AmbiguousContainerKind";
     case EOFValidationError::incompatible_container_kind:
         return "EOF_IncompatibleContainerKind";
+    case EOFValidationError::unreferenced_subcontainer:
+        return "EOF_UnreferencedSubcontainer";
     case EOFValidationError::impossible:
         return "impossible";
     }