Skip to content

Commit

Permalink
Merge pull request eth-brownie#1786 from eth-brownie/fix/cache
Browse files Browse the repository at this point in the history
Caching fixes
  • Loading branch information
iamdefinitelyahuman authored Jul 12, 2024
2 parents cc53694 + 690da0c commit 428ad1e
Show file tree
Hide file tree
Showing 2 changed files with 16 additions and 2 deletions.
12 changes: 10 additions & 2 deletions brownie/network/contract.py
Original file line number Diff line number Diff line change
Expand Up @@ -708,7 +708,9 @@ def __init__(
self, address: str, owner: Optional[AccountsType] = None, tx: TransactionReceiptType = None
) -> None:
address = _resolve_address(address)
self.bytecode = web3.eth.get_code(address).hex()[2:]
self.bytecode = (
self._build.get("deployedBytecode", None) or web3.eth.get_code(address).hex()[2:]
)
if not self.bytecode:
raise ContractNotFound(f"No contract deployed at {address}")
self._owner = owner
Expand Down Expand Up @@ -948,7 +950,13 @@ def from_abi(
will be performed using this account.
"""
address = _resolve_address(address)
build = {"abi": abi, "address": address, "contractName": name, "type": "contract"}
build = {
"abi": abi,
"address": address,
"contractName": name,
"type": "contract",
"deployedBytecode": web3.eth.get_code(address).hex()[2:],
}

self = cls.__new__(cls)
_ContractBase.__init__(self, None, build, {}) # type: ignore
Expand Down
6 changes: 6 additions & 0 deletions brownie/network/state.py
Original file line number Diff line number Diff line change
Expand Up @@ -632,6 +632,12 @@ def _add_deployment(contract: Any, alias: Optional[str] = None) -> None:
f"(address UNIQUE, alias UNIQUE, paths, {', '.join(DEPLOYMENT_KEYS)})"
)

if "compiler" not in contract._build:
# do not replace full contract artifacts with ABI-only ones
row = cur.fetchone(f"SELECT compiler FROM {name} WHERE address=?", (address,))
if row and row[0]:
return

all_sources = {}
for key, path in contract._build.get("allSourcePaths", {}).items():
source = contract._sources.get(path)
Expand Down

0 comments on commit 428ad1e

Please sign in to comment.