fix: add chainId to txn params (#2450) (#2455)

* fix: add chainId to txn params

* fix: error message on chain id hex to int

* Add newsfragment

Co-authored-by: kclowes <[email protected]>

Co-authored-by: Juliya Smith <[email protected]>

Author: kclowes

newsfragments/2450.misc.rst

@@ -0,0 +1 @@
+Add ``chainId`` to tx params to ``TRANSACTION_PARAMS_ABI``

web3/_utils/rpc_abi.py

@@ -163,6 +163,7 @@ class RPC:
     'nonce': 'uint',
     'to': 'address',
     'value': 'uint',
+    'chainId': 'uint',
 }
 
 FILTER_PARAMS_ABIS = {

web3/middleware/validation.py

@@ -55,15 +55,13 @@
 
 @curry
 def _validate_chain_id(web3_chain_id: int, chain_id: int) -> int:
-    if to_integer_if_hex(chain_id) == web3_chain_id:
+    chain_id_int = to_integer_if_hex(chain_id)
+    if chain_id_int == web3_chain_id:
         return chain_id
     else:
         raise ValidationError(
-            "The transaction declared chain ID %r, "
-            "but the connected node is on %r" % (
-                chain_id,
-                web3_chain_id,
-            )
+            f"The transaction declared chain ID {chain_id_int!r}, "
+            f"but the connected node is on {web3_chain_id!r}"
         )