Put back bit size validation to the strict bytes encoder

Author: fselmo

tests/core/utilities/test_abi.py

@@ -5,6 +5,7 @@
 )
 
 from web3._utils.abi import (
+    ExactLengthBytesEncoder,
     abi_data_tree,
     get_aligned_abi_inputs,
     get_tuple_type_str_parts,
@@ -350,3 +351,9 @@ def test_abi_data_tree(types, data, expected):
 )
 def test_map_abi_data(types, data, funcs, expected):
     assert map_abi_data(funcs, types, data) == expected
+
+
+@pytest.mark.parametrize("arg", (6, 7, 9, 12, 20, 30))
+def test_exact_length_bytes_encoder_raises_on_non_multiples_of_8_bit_size(arg):
+    with pytest.raises(ValueError, match="multiple of 8"):
+        _ = ExactLengthBytesEncoder(None, data_byte_size=2, value_bit_size=arg)

web3/_utils/abi.py

@@ -189,6 +189,7 @@ class AcceptsHexStrEncoder(encoding.BaseEncoder):
     is_strict: bool = None
     is_big_endian: bool = False
     data_byte_size: int = None
+    value_bit_size: int = None
 
     def __init__(
         self,
@@ -280,11 +281,22 @@ class ExactLengthBytesEncoder(BytesEncoder):
 
     def validate(self) -> None:
         super().validate()
+        if self.value_bit_size is None:
+            raise ValueError("`value_bit_size` may not be none")
         if self.data_byte_size is None:
             raise ValueError("`data_byte_size` may not be none")
         if self.is_big_endian is None:
             raise ValueError("`is_big_endian` may not be none")
 
+        if self.value_bit_size % 8 != 0:
+            raise ValueError(
+                f"Invalid value bit size: {self.value_bit_size}. "
+                "Must be a multiple of 8"
+            )
+
+        if self.value_bit_size > self.data_byte_size * 8:
+            raise ValueError("Value byte size exceeds data size")
+
     @parse_type_str("bytes")
     def from_type_str(cls, abi_type: BasicType, registry: ABIRegistry) -> bytes:
         subencoder_cls = cls.get_subencoder_class()
@@ -298,6 +310,7 @@ def from_type_str(cls, abi_type: BasicType, registry: ABIRegistry) -> bytes:
         # Unexpected keyword argument "value_bit_size" for "__call__" of "BaseEncoder"
         return cls(  # type: ignore
             subencoder,
+            value_bit_size=abi_type.sub * 8,
             data_byte_size=abi_type.sub,
         )