Skip to content

fix: add chainId to txn params #2450

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
May 2, 2022
Merged

fix: add chainId to txn params #2450

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
d2609c5
fix: add chainId to txn params
antazoey Apr 29, 2022
b4fac7b
chore: Merge branch 'master' into fix/jules-add-chain-id-to-txn-params
antazoey Apr 29, 2022
e55aa98
fix: error message on chain id hex to int
antazoey May 2, 2022
c75d61a
Add newsfragment
kclowes May 2, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions newsfragments/2450.misc.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Add ``chainId`` to tx params to ``TRANSACTION_PARAMS_ABI``
1 change: 1 addition & 0 deletions web3/_utils/rpc_abi.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -163,6 +163,7 @@ class RPC:
'nonce': 'uint',
'to': 'address',
'value': 'uint',
'chainId': 'uint',
}

FILTER_PARAMS_ABIS = {
Expand Down
5 changes: 3 additions & 2 deletions web3/middleware/validation.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,11 +55,12 @@

@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(
f"The transaction declared chain ID {chain_id!r}, "
f"The transaction declared chain ID {chain_id_int!r}, "
f"but the connected node is on {web3_chain_id!r}"
)

Expand Down