rebased on top of main, needs more testing don't approve yet

Author: felix314159

src/ethereum_test_forks/forks/forks.py

@@ -544,9 +544,9 @@ def pre_allocation_blockchain(cls) -> Mapping:
         return {}
 
     @classmethod
-    def blobs_supported(cls) -> bool:
-        """Return whether blobs are supported in this fork."""
-        return False
+    def engine_get_blobs_version(cls, block_number: int = 0, timestamp: int = 0) -> Optional[int]:
+        """At genesis, blobs cannot be retrieved through the engine API."""
+        return None
 
 
 class Homestead(Frontier):
@@ -1046,9 +1046,9 @@ def valid_opcodes(
         ] + super(Cancun, cls).valid_opcodes()
 
     @classmethod
-    def blobs_supported(cls) -> bool:
-        """Return whether blobs are supported in this fork."""
-        return True
+    def engine_get_blobs_version(cls, block_number: int = 0, timestamp: int = 0) -> int:
+        """At Cancun, the engine get blobs version is 1."""
+        return 1
 
 
 class Prague(Cancun):
@@ -1325,6 +1325,11 @@ def solc_min_version(cls) -> Version:
         """Return minimum version of solc that supports this fork."""
         return Version.parse("1.0.0")  # set a high version; currently unknown
 
+    @classmethod
+    def engine_get_blobs_version(cls, block_number: int = 0, timestamp: int = 0) -> int:
+        """At Osaka, the engine get blobs version is 2."""
+        return 2
+
 
 class EOFv1(Prague, solc_name="cancun"):
     """EOF fork."""

src/ethereum_test_types/blob.py

@@ -96,9 +96,9 @@ def get_filepath(fork: str, seed: int, timestamp: int):
     @staticmethod
     def NewBlob(fork: Fork, seed: int = 0, timestamp: int = 0) -> "Blob":  # noqa: N802
         """Construct Blob instances. Fork-specific logic is encapsulated within nested functions."""  # noqa: E501
-        assert fork.blobs_supported(), (
+        assert fork.engine_get_blobs_version() is not None, (
             f"You provided fork {fork.name()} but it does not support blobs!"
-        )  # TODO: why does mypy complain? this line works
+        )  # TODO: why does mypy say '"type[BaseFork]" has no attribute "engine_get_blobs_version"'?
 
         fork_str: str = fork.name().lower()
 
@@ -419,39 +419,39 @@ def corrupt_byte(b: bytes) -> Bytes:
 print(type(b.proof), len(b.proof))
 print(BYTES_PER_FIELD_ELEMENT)
 print(len(b.data))
-b.write_to_file()
-c: Blob = Blob.LoadBlobFromFile("blob_" + "osaka" + "_" + str(myseed) + "_" + str(mytimestamp))
-assert b.data == c.data
-assert b.commitment == c.commitment
-assert b.proof == c.proof
-assert b.cells == c.cells
-assert b.versioned_hash == c.versioned_hash
-assert b.name == c.name
-assert b.fork == c.fork
-assert b.timestamp == c.timestamp
+# b.write_to_file()
+# c: Blob = Blob.LoadBlobFromFile("blob_" + "osaka" + "_" + str(myseed) + "_" + str(mytimestamp))
+# assert b.data == c.data
+# assert b.commitment == c.commitment
+# assert b.proof == c.proof
+# assert b.cells == c.cells
+# assert b.versioned_hash == c.versioned_hash
+# assert b.name == c.name
+# assert b.fork == c.fork
+# assert b.timestamp == c.timestamp
 d: Blob = Blob.NewBlob(myprague, myseed, 123)
-d.write_to_file()
+# d.write_to_file()
 e: Blob = Blob.NewBlob(myprague, myseed, 123)
 print("Line above should say blob already existed and was loaded from file")
 ee: Blob = Blob.NewBlob(myprague, myseed, 1234)
 newtimestamp = 999999
 f: Blob = Blob.NewBlob(mycancun, 1337, newtimestamp)
-f.write_to_file()
+# f.write_to_file()
 h: Blob = Blob.NewBlob(myosaka, myseed)
-h.write_to_file()
+# h.write_to_file()
 zz: Blob = Blob.NewBlob(myosaka, myseed)
 print("Line above should say blob already existed and was loaded from file")
 # you can load a blob either via just filename or via absolute path or via relative path (cwd is ./src/ethereum_test_types)  # noqa: E501
-yyy: Blob = Blob.LoadBlobFromFile("blob_cancun_1337_999999.json")
-# yyyy: Blob = Blob.LoadBlobFromFile(
-#     "/home/user/Documents/execution-spec-tests/tests/cancun/eip4844_blobs/static_blobs/blob_cancun_1337.json"  # noqa: E501
-# )  # you must replace user with ur actual username as $USER not supported here
-yyyyy: Blob = Blob.LoadBlobFromFile(
-    "tests/cancun/eip4844_blobs/static_blobs/blob_cancun_1337_999999.json"
-)
-zzzzzzz: Blob = Blob.LoadBlobFromFile(
-    "./tests/cancun/eip4844_blobs/static_blobs/blob_cancun_1337_999999.json"
-)
+# yyy: Blob = Blob.LoadBlobFromFile("blob_cancun_1337_999999.json")
+# # yyyy: Blob = Blob.LoadBlobFromFile(
+# #     "/home/user/Documents/execution-spec-tests/tests/cancun/eip4844_blobs/static_blobs/blob_cancun_1337.json"  # noqa: E501
+# # )  # you must replace user with ur actual username as $USER not supported here
+# yyyyy: Blob = Blob.LoadBlobFromFile(
+#     "tests/cancun/eip4844_blobs/static_blobs/blob_cancun_1337_999999.json"
+# )
+# zzzzzzz: Blob = Blob.LoadBlobFromFile(
+#     "./tests/cancun/eip4844_blobs/static_blobs/blob_cancun_1337_999999.json"
+# )
 
 
 # test proof corruption