fix: check y_parity value (#1107)

obatirou · web-flow · commit fcd5dc394687 · 2025-02-12T09:38:58.000-05:00
diff --git a/src/ethereum/arrow_glacier/transactions.py b/src/ethereum/arrow_glacier/transactions.py
@@ -241,10 +241,14 @@ 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)
         )
diff --git a/src/ethereum/berlin/transactions.py b/src/ethereum/berlin/transactions.py
@@ -213,6 +213,8 @@ 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)
         )
diff --git a/src/ethereum/cancun/transactions.py b/src/ethereum/cancun/transactions.py
@@ -280,14 +280,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)
         )
diff --git a/src/ethereum/gray_glacier/transactions.py b/src/ethereum/gray_glacier/transactions.py
@@ -241,10 +241,14 @@ 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)
         )
diff --git a/src/ethereum/london/transactions.py b/src/ethereum/london/transactions.py
@@ -241,10 +241,14 @@ 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)
         )
diff --git a/src/ethereum/paris/transactions.py b/src/ethereum/paris/transactions.py
@@ -241,10 +241,14 @@ 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)
         )
diff --git a/src/ethereum/shanghai/transactions.py b/src/ethereum/shanghai/transactions.py
@@ -248,10 +248,14 @@ 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)
         )

Original file line number	Diff line number	Diff line change
`@@ -241,10 +241,14 @@ def recover_sender(chain_id: U64, tx: Transaction) -> Address:`
`241`	`241`	`signing_hash_155(tx, chain_id),`
`242`	`242`	`)`
`243`	`243`	`elif isinstance(tx, AccessListTransaction):`
	`244`	`+ if tx.y_parity not in (U256(0), U256(1)):`
	`245`	`+ raise InvalidSignatureError("bad y_parity")`
`244`	`246`	`public_key = secp256k1_recover(`
`245`	`247`	`r, s, tx.y_parity, signing_hash_2930(tx)`
`246`	`248`	`)`
`247`	`249`	`elif isinstance(tx, FeeMarketTransaction):`
	`250`	`+ if tx.y_parity not in (U256(0), U256(1)):`
	`251`	`+ raise InvalidSignatureError("bad y_parity")`
`248`	`252`	`public_key = secp256k1_recover(`
`249`	`253`	`r, s, tx.y_parity, signing_hash_1559(tx)`
`250`	`254`	`)`
Original file line number	Diff line number	Diff line change
`@@ -213,6 +213,8 @@ def recover_sender(chain_id: U64, tx: Transaction) -> Address:`
`213`	`213`	`signing_hash_155(tx, chain_id),`
`214`	`214`	`)`
`215`	`215`	`elif isinstance(tx, AccessListTransaction):`
	`216`	`+ if tx.y_parity not in (U256(0), U256(1)):`
	`217`	`+ raise InvalidSignatureError("bad y_parity")`
`216`	`218`	`public_key = secp256k1_recover(`
`217`	`219`	`r, s, tx.y_parity, signing_hash_2930(tx)`
`218`	`220`	`)`
Original file line number	Diff line number	Diff line change
`@@ -280,14 +280,20 @@ def recover_sender(chain_id: U64, tx: Transaction) -> Address:`
`280`	`280`	`signing_hash_155(tx, chain_id),`
`281`	`281`	`)`
`282`	`282`	`elif isinstance(tx, AccessListTransaction):`
	`283`	`+ if tx.y_parity not in (U256(0), U256(1)):`
	`284`	`+ raise InvalidSignatureError("bad y_parity")`
`283`	`285`	`public_key = secp256k1_recover(`
`284`	`286`	`r, s, tx.y_parity, signing_hash_2930(tx)`
`285`	`287`	`)`
`286`	`288`	`elif isinstance(tx, FeeMarketTransaction):`
	`289`	`+ if tx.y_parity not in (U256(0), U256(1)):`
	`290`	`+ raise InvalidSignatureError("bad y_parity")`
`287`	`291`	`public_key = secp256k1_recover(`
`288`	`292`	`r, s, tx.y_parity, signing_hash_1559(tx)`
`289`	`293`	`)`
`290`	`294`	`elif isinstance(tx, BlobTransaction):`
	`295`	`+ if tx.y_parity not in (U256(0), U256(1)):`
	`296`	`+ raise InvalidSignatureError("bad y_parity")`
`291`	`297`	`public_key = secp256k1_recover(`
`292`	`298`	`r, s, tx.y_parity, signing_hash_4844(tx)`
`293`	`299`	`)`
Original file line number	Diff line number	Diff line change
`@@ -248,10 +248,14 @@ def recover_sender(chain_id: U64, tx: Transaction) -> Address:`
`248`	`248`	`signing_hash_155(tx, chain_id),`
`249`	`249`	`)`
`250`	`250`	`elif isinstance(tx, AccessListTransaction):`
	`251`	`+ if tx.y_parity not in (U256(0), U256(1)):`
	`252`	`+ raise InvalidSignatureError("bad y_parity")`
`251`	`253`	`public_key = secp256k1_recover(`
`252`	`254`	`r, s, tx.y_parity, signing_hash_2930(tx)`
`253`	`255`	`)`
`254`	`256`	`elif isinstance(tx, FeeMarketTransaction):`
	`257`	`+ if tx.y_parity not in (U256(0), U256(1)):`
	`258`	`+ raise InvalidSignatureError("bad y_parity")`
`255`	`259`	`public_key = secp256k1_recover(`
`256`	`260`	`r, s, tx.y_parity, signing_hash_1559(tx)`
`257`	`261`	`)`