Skip to content
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

Jump to bottom

fix: validate Ape has connected to the right network and client #1038

Merged
merged 10 commits into from
Sep 15, 2022
Merged

fix: validate Ape has connected to the right network and client #1038

Changes from 1 commit
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
d859fa4
fix: always prefer web3.eth.chain_id over hardcoded (if available)
fubuloubu Sep 7, 2022
8d4371f
chore: Merge branch 'main' into fix/geth-connection-validation
antazoey Sep 7, 2022
830f96e
feat: complete
antazoey Sep 7, 2022
da76346
chore: revise
antazoey Sep 7, 2022
af20038
Merge branch 'main' into fix/geth-connection-validation
antazoey Sep 7, 2022
b456683
chore: Merge branch 'main' into fix/geth-connection-validation
antazoey Sep 13, 2022
c6a7323
chore: Merge branch 'main' into fix/geth-connection-validation
antazoey Sep 14, 2022
cd63644
feat: improve error message and add test
antazoey Sep 14, 2022
5da82a7
docs: add comment
antazoey Sep 14, 2022
85a1e24
fix: use is not None
antazoey Sep 14, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
8 changes: 4 additions & 4 deletions src/ape/api/providers.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -681,16 +681,16 @@ def estimate_gas_cost(self, txn: TransactionAPI, **kwargs) -> int:

@property
def chain_id(self) -> int:
if self.network.name not in (
if hasattr(self.web3, "eth"):
antazoey marked this conversation as resolved.
Show resolved Hide resolved
return self.web3.eth.chain_id

elif self.network.name not in (
"adhoc",
LOCAL_NETWORK_NAME,
) and not self.network.name.endswith("-fork"):
# If using a live network, the chain ID is hardcoded.
return self.network.chain_id

elif hasattr(self.web3, "eth"):
return self.web3.eth.chain_id

else:
raise ProviderNotConnectedError()

Expand Down