ronin-chain
diff --git a/‎eels_resolutions.json
Lines changed: 2 additions & 2 deletions b/‎eels_resolutions.json
Lines changed: 2 additions & 2 deletions
diff --git a/‎pyproject.toml
Lines changed: 1 addition & 0 deletions b/‎pyproject.toml
Lines changed: 1 addition & 0 deletions
diff --git a/‎src/ethereum_clis/clis/execution_specs.py
Lines changed: 8 additions & 0 deletions b/‎src/ethereum_clis/clis/execution_specs.py
Lines changed: 8 additions & 0 deletions
diff --git a/‎src/ethereum_test_base_types/__init__.py
Lines changed: 3 additions & 0 deletions b/‎src/ethereum_test_base_types/__init__.py
Lines changed: 3 additions & 0 deletions
diff --git a/‎src/ethereum_test_base_types/composite_types.py
Lines changed: 3 additions & 4 deletions b/‎src/ethereum_test_base_types/composite_types.py
Lines changed: 3 additions & 4 deletions
diff --git a/‎src/ethereum_test_base_types/serialization.py
Lines changed: 145 additions & 0 deletions b/‎src/ethereum_test_base_types/serialization.py
Lines changed: 145 additions & 0 deletions
diff --git a/‎src/ethereum_test_execution/transaction_post.py
Lines changed: 11 additions & 12 deletions b/‎src/ethereum_test_execution/transaction_post.py
Lines changed: 11 additions & 12 deletions
diff --git a/‎src/ethereum_test_fixtures/blockchain.py
Lines changed: 1 addition & 1 deletion b/‎src/ethereum_test_fixtures/blockchain.py
Lines changed: 1 addition & 1 deletion
diff --git a/‎src/ethereum_test_fixtures/common.py
Lines changed: 39 additions & 1 deletion b/‎src/ethereum_test_fixtures/common.py
Lines changed: 39 additions & 1 deletion
diff --git a/‎src/ethereum_test_rpc/rpc.py
Lines changed: 10 additions & 8 deletions b/‎src/ethereum_test_rpc/rpc.py
Lines changed: 10 additions & 8 deletions
@@ -36,7 +36,7 @@
     },
     "Prague": {
         "git_url": "https://github.com/sonhv0212/execution-specs.git",
-        "branch": "devnets/prague/6",
-        "commit": "51ba0176f320a79e161c27246f1d36b5919e6761"
+        "branch": "prague/mario",
+        "commit": "d97c29fd1b7ad48574e81d5f9a5593406c646f51"
     }
 }
@@ -51,6 +51,7 @@ dependencies = [
     "questionary @ git+https://github.com/tmbo/questionary@ff22aeae1cd9c1c734f14329934e349bec7873bc",
     "prompt_toolkit>=3.0.48,<4", # ensure we have a new enough version for ipython
     "ethereum-rlp>=0.1.3,<0.2",
+    "joblib>=1.4.2",
 ]
 
 [project.urls]
 
@@ -130,6 +130,14 @@ class ExecutionSpecsExceptionMapper(ExceptionMapper):
     @property
     def _mapping_data(self):
         return [
+            ExceptionMessage(
+                TransactionException.TYPE_4_EMPTY_AUTHORIZATION_LIST,
+                "Failed transaction: InvalidBlock()",
+            ),
+            ExceptionMessage(
+                TransactionException.SENDER_NOT_EOA,
+                "Failed transaction: InvalidSenderError('not EOA')",
+            ),
             ExceptionMessage(
                 TransactionException.TYPE_4_TX_CONTRACT_CREATION,
                 "Failed transaction: ",
 
@@ -39,6 +39,7 @@
 from .json import to_json
 from .pydantic import CamelModel, EthereumTestBaseModel, EthereumTestRootModel
 from .reference_spec import ReferenceSpec
+from .serialization import RLPSerializable, SignableRLPSerializable
 
 __all__ = (
     "AccessList",
@@ -66,6 +67,8 @@
     "Number",
     "NumberBoundTypeVar",
     "ReferenceSpec",
+    "RLPSerializable",
+    "SignableRLPSerializable",
     "Storage",
     "StorageRootType",
     "TestAddress",
 
@@ -8,6 +8,7 @@
 from .base_types import Address, Bytes, Hash, HashInt, HexNumber, ZeroPaddedHexNumber
 from .conversions import BytesConvertible, NumberConvertible
 from .pydantic import CamelModel, EthereumTestRootModel
+from .serialization import RLPSerializable
 
 StorageKeyValueTypeConvertible = NumberConvertible
 StorageKeyValueType = HashInt
@@ -460,15 +461,13 @@ class Alloc(EthereumTestRootModel[Dict[Address, Account | None]]):
     root: Dict[Address, Account | None] = Field(default_factory=dict, validate_default=True)
 
 
-class AccessList(CamelModel):
+class AccessList(CamelModel, RLPSerializable):
     """Access List for transactions."""
 
     address: Address
     storage_keys: List[Hash]
 
-    def to_list(self) -> List[Address | List[Hash]]:
-        """Return access list as a list of serializable elements."""
-        return [self.address, self.storage_keys]
+    rlp_fields: ClassVar[List[str]] = ["address", "storage_keys"]
 
 
 class ForkBlobSchedule(CamelModel):
 
@@ -0,0 +1,145 @@
+"""Ethereum test types for serialization and encoding."""
+
+from typing import Any, ClassVar, List
+
+import ethereum_rlp as eth_rlp
+from ethereum_types.numeric import Uint
+
+from ethereum_test_base_types import Bytes
+
+
+def to_serializable_element(v: Any) -> Any:
+    """Return a serializable element that can be passed to `eth_rlp.encode`."""
+    if isinstance(v, int):
+        return Uint(v)
+    elif isinstance(v, bytes):
+        return v
+    elif isinstance(v, list):
+        return [to_serializable_element(v) for v in v]
+    elif isinstance(v, RLPSerializable):
+        if v.signable:
+            v.sign()
+        return v.to_list(signing=False)
+    elif v is None:
+        return b""
+    raise Exception(f"Unable to serialize element {v} of type {type(v)}.")
+
+
+class RLPSerializable:
+    """Class that adds RLP serialization to another class."""
+
+    rlp_override: Bytes | None = None
+
+    signable: ClassVar[bool] = False
+    rlp_fields: ClassVar[List[str]]
+    rlp_signing_fields: ClassVar[List[str]]
+
+    def get_rlp_fields(self) -> List[str]:
+        """
+        Return an ordered list of field names to be included in RLP serialization.
+
+        Function can be overridden to customize the logic to return the fields.
+
+        By default, rlp_fields class variable is used.
+
+        The list can be nested list up to one extra level to represent nested fields.
+        """
+        return self.rlp_fields
+
+    def get_rlp_signing_fields(self) -> List[str]:
+        """
+        Return an ordered list of field names to be included in the RLP serialization of the object
+        signature.
+
+        Function can be overridden to customize the logic to return the fields.
+
+        By default, rlp_signing_fields class variable is used.
+
+        The list can be nested list up to one extra level to represent nested fields.
+        """
+        return self.rlp_signing_fields
+
+    def get_rlp_prefix(self) -> bytes:
+        """
+        Return a prefix that has to be appended to the serialized object.
+
+        By default, an empty string is returned.
+        """
+        return b""
+
+    def get_rlp_signing_prefix(self) -> bytes:
+        """
+        Return a prefix that has to be appended to the serialized signing object.
+
+        By default, an empty string is returned.
+        """
+        return b""
+
+    def sign(self):
+        """Sign the current object for further serialization."""
+        raise NotImplementedError(f'Object "{self.__class__.__name__}" cannot be signed.')
+
+    def to_list_from_fields(self, fields: List[str]) -> List[Any]:
+        """
+        Return an RLP serializable list that can be passed to `eth_rlp.encode`.
+
+        Can be for signing purposes or the entire object.
+        """
+        values_list: List[Any] = []
+        for field in fields:
+            assert isinstance(field, str), (
+                f'Unable to rlp serialize field "{field}" '
+                f'in object type "{self.__class__.__name__}"'
+            )
+            assert hasattr(self, field), (
+                f'Unable to rlp serialize field "{field}" '
+                f'in object type "{self.__class__.__name__}"'
+            )
+            try:
+                values_list.append(to_serializable_element(getattr(self, field)))
+            except Exception as e:
+                raise Exception(
+                    f'Unable to rlp serialize field "{field}" '
+                    f'in object type "{self.__class__.__name__}"'
+                ) from e
+        return values_list
+
+    def to_list(self, signing: bool = False) -> List[Any]:
+        """
+        Return an RLP serializable list that can be passed to `eth_rlp.encode`.
+
+        Can be for signing purposes or the entire object.
+        """
+        field_list: List[str]
+        if signing:
+            if not self.signable:
+                raise Exception(f'Object "{self.__class__.__name__}" does not support signing')
+            field_list = self.get_rlp_signing_fields()
+        else:
+            if self.signable:
+                # Automatically sign signable objects during full serialization:
+                # Ensures nested objects have valid signatures in the final RLP.
+                self.sign()
+            field_list = self.get_rlp_fields()
+
+        return self.to_list_from_fields(field_list)
+
+    def rlp_signing_bytes(self) -> Bytes:
+        """Return the signing serialized envelope used for signing."""
+        return Bytes(self.get_rlp_signing_prefix() + eth_rlp.encode(self.to_list(signing=True)))
+
+    def rlp(self) -> Bytes:
+        """Return the serialized object."""
+        if self.rlp_override is not None:
+            return self.rlp_override
+        return Bytes(self.get_rlp_prefix() + eth_rlp.encode(self.to_list(signing=False)))
+
+
+class SignableRLPSerializable(RLPSerializable):
+    """Class that adds RLP serialization to another class with signing support."""
+
+    signable: ClassVar[bool] = True
+
+    def sign(self):
+        """Sign the current object for further serialization."""
+        raise NotImplementedError(f'Object "{self.__class__.__name__}" needs to implement `sign`.')
@@ -14,7 +14,7 @@
 class TransactionPost(BaseExecute):
     """Represents a simple transaction-send then post-check execution format."""
 
-    transactions: List[Transaction]
+    blocks: List[List[Transaction]]
     post: Alloc
 
     execute_format_name: ClassVar[str] = "transaction_post"
@@ -24,17 +24,16 @@ class TransactionPost(BaseExecute):
 
     def execute(self, eth_rpc: EthRPC):
         """Execute the format."""
-        if any(tx.error is not None for tx in self.transactions):
-            for transaction in self.transactions:
-                if transaction.error is None:
-                    eth_rpc.send_wait_transaction(transaction.with_signature_and_sender())
-                else:
-                    with pytest.raises(SendTransactionExceptionError):
-                        eth_rpc.send_transaction(transaction.with_signature_and_sender())
-        else:
-            eth_rpc.send_wait_transactions(
-                [tx.with_signature_and_sender() for tx in self.transactions]
-            )
+        for block in self.blocks:
+            if any(tx.error is not None for tx in block):
+                for transaction in block:
+                    if transaction.error is None:
+                        eth_rpc.send_wait_transaction(transaction.with_signature_and_sender())
+                    else:
+                        with pytest.raises(SendTransactionExceptionError):
+                            eth_rpc.send_transaction(transaction.with_signature_and_sender())
+            else:
+                eth_rpc.send_wait_transactions([tx.with_signature_and_sender() for tx in block])
 
         for address, account in self.post.root.items():
             balance = eth_rpc.get_balance(address)
 
@@ -206,7 +206,7 @@ def from_fixture_header(
         """
         return cls(
             **header.model_dump(exclude={"rlp"}, exclude_none=True),
-            transactions=[tx.rlp for tx in transactions],
+            transactions=[tx.rlp() for tx in transactions],
         )
 
 
 
@@ -2,14 +2,16 @@
 
 from typing import Dict
 
-from pydantic import Field
+from pydantic import AliasChoices, Field, model_serializer
 
 from ethereum_test_base_types import (
     BlobSchedule,
     CamelModel,
     EthereumTestRootModel,
+    SignableRLPSerializable,
     ZeroPaddedHexNumber,
 )
+from ethereum_test_types.types import Address, AuthorizationTupleGeneric
 
 
 class FixtureForkBlobSchedule(CamelModel):
@@ -35,3 +37,39 @@ def from_blob_schedule(
         return cls(
             root=blob_schedule.model_dump(),
         )
+
+
+class FixtureAuthorizationTuple(
+    AuthorizationTupleGeneric[ZeroPaddedHexNumber], SignableRLPSerializable
+):
+    """Authorization tuple for fixture transactions."""
+
+    v: ZeroPaddedHexNumber = Field(validation_alias=AliasChoices("v", "yParity"))  # type: ignore
+    r: ZeroPaddedHexNumber
+    s: ZeroPaddedHexNumber
+
+    signer: Address | None = None
+
+    @classmethod
+    def from_authorization_tuple(
+        cls, auth_tuple: AuthorizationTupleGeneric
+    ) -> "FixtureAuthorizationTuple":
+        """Return FixtureAuthorizationTuple from an AuthorizationTuple."""
+        return cls(**auth_tuple.model_dump())
+
+    @model_serializer(mode="wrap", when_used="json-unless-none")
+    def duplicate_v_as_y_parity(self, serializer):
+        """
+        Add a duplicate 'yParity' field (same as `v`) in JSON fixtures.
+
+        Background: https://github.com/erigontech/erigon/issues/14073
+        """
+        data = serializer(self)
+        if "v" in data and data["v"] is not None:
+            data["yParity"] = data["v"]
+        return data
+
+    def sign(self):
+        """Sign the current object for further serialization."""
+        # No-op, as the object is always already signed
+        return
@@ -136,13 +136,13 @@ def get_transaction_count(
         block = hex(block_number) if isinstance(block_number, int) else block_number
         return int(self.post_request("getTransactionCount", f"{address}", block), 16)
 
-    def get_transaction_by_hash(self, transaction_hash: Hash) -> TransactionByHashResponse:
+    def get_transaction_by_hash(self, transaction_hash: Hash) -> TransactionByHashResponse | None:
         """`eth_getTransactionByHash`: Returns transaction details."""
         try:
-            resp = TransactionByHashResponse(
-                **self.post_request("getTransactionByHash", f"{transaction_hash}")
-            )
-            return resp
+            response = self.post_request("getTransactionByHash", f"{transaction_hash}")
+            if response is None:
+                return None
+            return TransactionByHashResponse(**response)
         except ValidationError as e:
             pprint(e.errors())
             raise e
@@ -170,7 +170,9 @@ def send_raw_transaction(self, transaction_rlp: Bytes) -> Hash:
     def send_transaction(self, transaction: Transaction) -> Hash:
         """`eth_sendRawTransaction`: Send a transaction to the client."""
         try:
-            result_hash = Hash(self.post_request("sendRawTransaction", f"{transaction.rlp.hex()}"))
+            result_hash = Hash(
+                self.post_request("sendRawTransaction", f"{transaction.rlp().hex()}")
+            )
             assert result_hash == transaction.hash
             assert result_hash is not None
             return transaction.hash
@@ -200,7 +202,7 @@ def wait_for_transaction(self, transaction: Transaction) -> TransactionByHashRes
         start_time = time.time()
         while True:
             tx = self.get_transaction_by_hash(tx_hash)
-            if tx.block_number is not None:
+            if tx is not None and tx.block_number is not None:
                 return tx
             if (time.time() - start_time) > self.transaction_wait_timeout:
                 break
@@ -225,7 +227,7 @@ def wait_for_transactions(
             while i < len(tx_hashes):
                 tx_hash = tx_hashes[i]
                 tx = self.get_transaction_by_hash(tx_hash)
-                if tx.block_number is not None:
+                if tx is not None and tx.block_number is not None:
                     responses.append(tx)
                     tx_hashes.pop(i)
                 else:
Original file line number	Diff line number	Diff line change
`@@ -36,7 +36,7 @@`
`36`	`36`	`},`
`37`	`37`	`"Prague": {`
`38`	`38`	`"git_url": "https://github.com/sonhv0212/execution-specs.git",`
`39`		`- "branch": "devnets/prague/6",`
`40`		`- "commit": "51ba0176f320a79e161c27246f1d36b5919e6761"`
	`39`	`+ "branch": "prague/mario",`
	`40`	`+ "commit": "d97c29fd1b7ad48574e81d5f9a5593406c646f51"`
`41`	`41`	`}`
`42`	`42`	`}`
Original file line number	Diff line number	Diff line change
`@@ -51,6 +51,7 @@ dependencies = [`
`51`	`51`	`"questionary @ git+https://github.com/tmbo/questionary@ff22aeae1cd9c1c734f14329934e349bec7873bc",`
`52`	`52`	`"prompt_toolkit>=3.0.48,<4", # ensure we have a new enough version for ipython`
`53`	`53`	`"ethereum-rlp>=0.1.3,<0.2",`
	`54`	`+ "joblib>=1.4.2",`
`54`	`55`	`]`
`55`	`56`
`56`	`57`	`[project.urls]`
Original file line number	Diff line number	Diff line change
`@@ -206,7 +206,7 @@ def from_fixture_header(`
`206`	`206`	`"""`
`207`	`207`	`return cls(`
`208`	`208`	`**header.model_dump(exclude={"rlp"}, exclude_none=True),`
`209`		`- transactions=[tx.rlp for tx in transactions],`
	`209`	`+ transactions=[tx.rlp() for tx in transactions],`
`210`	`210`	`)`
`211`	`211`
`212`	`212`