feat(types,plugins): Allow nonce in fund_eoa

ethereum · Oct 11, 2024 · a15156f · a15156f
1 parent a77c401
commit a15156f
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 4 deletions.
diff --git a/src/ethereum_test_types/types.py b/src/ethereum_test_types/types.py
@@ -310,6 +310,7 @@ def fund_eoa(
         label: str | None = None,
         storage: Storage | None = None,
         delegation: Address | Literal["Self"] | None = None,
+        nonce: NumberConvertible | None = None,
     ) -> EOA:
         """
         Add a previously unused EOA to the pre-alloc with the balance specified by `amount`.

diff --git a/src/pytest_plugins/filler/pre_alloc.py b/src/pytest_plugins/filler/pre_alloc.py
@@ -199,6 +199,7 @@ def fund_eoa(
         label: str | None = None,
         storage: Storage | None = None,
         delegation: Address | Literal["Self"] | None = None,
+        nonce: NumberConvertible | None = None,
     ) -> EOA:
         """
         Add a previously unused EOA to the pre-alloc with the balance specified by `amount`.
@@ -209,25 +210,34 @@ def fund_eoa(
         eoa = next(self._eoa_iterator)
         if amount is None:
             amount = self._eoa_fund_amount_default
-        if Number(amount) > 0 or storage is not None or delegation is not None:
+        if (
+            Number(amount) > 0
+            or storage is not None
+            or delegation is not None
+            or (nonce is not None and Number(nonce) > 0)
+        ):
             if storage is None and delegation is None:
+                nonce = Number(0 if nonce is None else nonce)
                 account = Account(
-                    nonce=0,
+                    nonce=nonce,
                     balance=amount,
                 )
+                if nonce > 0:
+                    eoa.nonce = nonce
             else:
                 # Type-4 transaction is sent to the EOA to set the storage, so the nonce must be 1
                 if not isinstance(delegation, Address) and delegation == "Self":
                     delegation = eoa
+                nonce = Number(1 if nonce is None else nonce)
                 account = Account(
-                    nonce=1,
+                    nonce=nonce,
                     balance=amount,
                     storage=storage if storage is not None else {},
                     code=DELEGATION_DESIGNATION + bytes(delegation)  # type: ignore
                     if delegation is not None
                     else b"",
                 )
-                eoa.nonce = Number(1)
+                eoa.nonce = nonce
 
             super().__setitem__(eoa, account)
         return eoa