Merge remote-tracking branch 'upstream/forks/prague' into prague-release-prep

SamWilsn · SamWilsn · commit dc76275b6875 · 2025-02-13T16:34:41.000-05:00
diff --git a/src/ethereum/prague/transactions.py b/src/ethereum/prague/transactions.py
@@ -344,14 +344,20 @@ def recover_sender(chain_id: U64, tx: Transaction) -> Address:
                 signing_hash_155(tx, chain_id),
             )
     elif isinstance(tx, AccessListTransaction):
+        if tx.y_parity not in (U256(0), U256(1)):
+            raise InvalidSignatureError("bad y_parity")
         public_key = secp256k1_recover(
             r, s, tx.y_parity, signing_hash_2930(tx)
         )
     elif isinstance(tx, FeeMarketTransaction):
+        if tx.y_parity not in (U256(0), U256(1)):
+            raise InvalidSignatureError("bad y_parity")
         public_key = secp256k1_recover(
             r, s, tx.y_parity, signing_hash_1559(tx)
         )
     elif isinstance(tx, BlobTransaction):
+        if tx.y_parity not in (U256(0), U256(1)):
+            raise InvalidSignatureError("bad y_parity")
         public_key = secp256k1_recover(
             r, s, tx.y_parity, signing_hash_4844(tx)
         )

Original file line number	Diff line number	Diff line change
`@@ -344,14 +344,20 @@ def recover_sender(chain_id: U64, tx: Transaction) -> Address:`
`344`	`344`	`signing_hash_155(tx, chain_id),`
`345`	`345`	`)`
`346`	`346`	`elif isinstance(tx, AccessListTransaction):`
	`347`	`+ if tx.y_parity not in (U256(0), U256(1)):`
	`348`	`+ raise InvalidSignatureError("bad y_parity")`
`347`	`349`	`public_key = secp256k1_recover(`
`348`	`350`	`r, s, tx.y_parity, signing_hash_2930(tx)`
`349`	`351`	`)`
`350`	`352`	`elif isinstance(tx, FeeMarketTransaction):`
	`353`	`+ if tx.y_parity not in (U256(0), U256(1)):`
	`354`	`+ raise InvalidSignatureError("bad y_parity")`
`351`	`355`	`public_key = secp256k1_recover(`
`352`	`356`	`r, s, tx.y_parity, signing_hash_1559(tx)`
`353`	`357`	`)`
`354`	`358`	`elif isinstance(tx, BlobTransaction):`
	`359`	`+ if tx.y_parity not in (U256(0), U256(1)):`
	`360`	`+ raise InvalidSignatureError("bad y_parity")`
`355`	`361`	`public_key = secp256k1_recover(`
`356`	`362`	`r, s, tx.y_parity, signing_hash_4844(tx)`
`357`	`363`	`)`