ci: sync to latest version of 1.20.x

.github/workflows/core-ganache-3.10.yaml

@@ -1,6 +1,11 @@
 name: Core Ganache (py3.10)
 on: ["push", "pull_request"]
 
+# This limits the workflow to 1 active run at any given time for a specific branch
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: true
+
 env:
   ETHERSCAN_TOKEN: 9MKURTHE8FNA9NRUUJBHMUEVY6IQ5K1EGY
   GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/core-ganache-3.11.yaml

@@ -1,6 +1,11 @@
 name: Core Ganache (py3.11)
 on: ["push", "pull_request"]
 
+# This limits the workflow to 1 active run at any given time for a specific branch
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: true
+
 env:
   ETHERSCAN_TOKEN: 9MKURTHE8FNA9NRUUJBHMUEVY6IQ5K1EGY
   GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/core-ganache-3.12.yaml

@@ -1,6 +1,11 @@
 name: Core Ganache (py3.12)
 on: ["push", "pull_request"]
 
+# This limits the workflow to 1 active run at any given time for a specific branch
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: true
+
 env:
   ETHERSCAN_TOKEN: 9MKURTHE8FNA9NRUUJBHMUEVY6IQ5K1EGY
   GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/evm.yaml

@@ -2,6 +2,11 @@ on: ["push", "pull_request"]
 
 name: evm tests
 
+# This limits the workflow to 1 active run at any given time for a specific branch
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: true
+
 env:
   ETHERSCAN_TOKEN: 9MKURTHE8FNA9NRUUJBHMUEVY6IQ5K1EGY
   GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/functionality.yaml

@@ -2,6 +2,11 @@ on: ["push", "pull_request"]
 
 name: functionality
 
+# This limits the workflow to 1 active run at any given time for a specific branch
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: true
+
 env:
   ETHERSCAN_TOKEN: 9MKURTHE8FNA9NRUUJBHMUEVY6IQ5K1EGY
   GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/lint.yaml

@@ -2,6 +2,11 @@ on: ["push", "pull_request"]
 
 name: linting
 
+# This limits the workflow to 1 active run at any given time for a specific branch
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: true
+
 env:
   ETHERSCAN_TOKEN: 9MKURTHE8FNA9NRUUJBHMUEVY6IQ5K1EGY
   GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/pip-compile.yaml

@@ -0,0 +1,49 @@
+name: Pip Compile
+
+on:
+  pull_request:
+    branches:
+      - master
+    paths:
+      - 'requirements.in'
+      - 'requirements-windows.in'
+      - 'requirements-dev.in'
+
+jobs:
+  format:
+    runs-on: ubuntu-latest
+
+    steps:
+    - name: Checkout code
+      uses: actions/checkout@v3
+      with:
+        ref: ${{ github.head_ref }}  # Check out the PR branch
+
+    - name: Set up Python
+      uses: actions/setup-python@v4
+      with:
+        python-version: '3.11'
+
+    - name: Install Pip Tools
+      run: pip install pip-tools
+
+    - name: Run Pip Compile
+      run: pip-compile
+
+    - name: Check for changes
+      id: changes
+      run: |
+        if [[ -n $(git status --porcelain) ]]; then
+          echo "changes_detected=true" >> $GITHUB_ENV
+        else
+          echo "changes_detected=false" >> $GITHUB_ENV
+        fi
+
+    - name: Commit changes
+      if: env.changes_detected == 'true'
+      run: |
+        git config --local user.name "github-actions[bot]"
+        git config --local user.email "github-actions[bot]@users.noreply.github.com"
+        git add .
+        git commit -m "chore: \`pip-compile\`"
+        git push

CHANGELOG.md

@@ -6,6 +6,32 @@ This changelog format is based on [Keep a Changelog](https://keepachangelog.com/
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
 ## [Unreleased](https://github.com/eth-brownie/brownie)
+### Changed
+- replace `eth_utils.to_checksum_address` with `cchecksum.to_checksum_address` for ~2x faster checksumming ([#1796](https://github.com/eth-brownie/brownie/pull/1796))
+
+## [1.20.7](https://github.com/eth-brownie/brownie/tree/v1.20.7) - 2025-01-07
+### Added
+- Support for vyper `0.4.0` ([#1793](https://github.com/eth-brownie/brownie/pull/1793))
+- `py.typed` marker ([#1794](https://github.com/eth-brownie/brownie/pull/1794))
+
+### Fixed
+- Improvements to caching ([#1786](https://github.com/eth-brownie/brownie/pull/1786))
+
+### Removed
+- `tqdm` progress bars during compiler installation ([#1785](https://github.com/eth-brownie/brownie/pull/1785))
+
+## [1.20.6](https://github.com/eth-brownie/brownie/tree/v1.20.6) - 2024-06-22
+### Added
+- `include` kwarg for address strategy, type-dependent strategy overloads ([#1780](https://github.com/eth-brownie/brownie/pull/1780))
+
+### Fixed
+- ds-note decoding ([#1781](https://github.com/eth-brownie/brownie/pull/1781))
+- "Dropped without known replacement" tx race condition ([#1782](https://github.com/eth-brownie/brownie/pull/1782))
+
+## [1.20.5](https://github.com/eth-brownie/brownie/tree/v1.20.5) - 2024-05-22
+### Fixed
+- Handle missing `blockNumber` while awaiting confirmation ([#1774](https://github.com/eth-brownie/brownie/pull/1774))
+- Search parent paths for file import during source verification ([#1776](https://github.com/eth-brownie/brownie/pull/1776))
 
 ## [1.20.4](https://github.com/eth-brownie/brownie/tree/v1.20.4) - 2024-05-08
 ### Fixed
@@ -102,7 +128,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [1.19.0](https://github.com/eth-brownie/brownie/tree/v1.19.0) - 2022-05-29
 ### Added
-- Initial support for [Anvil](https://github.com/foundry-rs/foundry/tree/master/anvil), a blazing-fast local testnet node implementation in Rust ([#1541](https://github.com/eth-brownie/brownie/pull/1541))
+- Initial support for [Anvil](https://github.com/foundry-rs/foundry/tree/master/crates/anvil), a blazing-fast local testnet node implementation in Rust ([#1541](https://github.com/eth-brownie/brownie/pull/1541))
 - Support configurable initial wallet balance, chain id, and gas limit.
 
 ### Fixed

README.md

@@ -46,7 +46,7 @@ To upgrade to the latest version:
 pipx upgrade eth-brownie
 ```
 
-To use lastest master or another branch as version:
+To use latest master or another branch as version:
 ```bash
 pipx install git+https://github.com/eth-brownie/brownie.git@master
 ```

brownie/_config.py

@@ -19,7 +19,7 @@
 from brownie._expansion import expand_posix_vars
 from brownie._singleton import _Singleton
 
-__version__ = "1.20.4"
+__version__ = "1.20.7"
 
 BROWNIE_FOLDER = Path(__file__).parent
 DATA_FOLDER = Path.home().joinpath(".brownie")

brownie/convert/datatypes.py

@@ -9,6 +9,7 @@
 except ImportError:
     DecimalOverrideException = BaseException  # regular catch blocks shouldn't catch
 
+import cchecksum
 import eth_utils
 from hexbytes import HexBytes
 
@@ -205,7 +206,7 @@ def __new__(cls, value: Union[bytes, str]) -> str:
             converted_value = HexBytes(value).hex()
         converted_value = eth_utils.add_0x_prefix(str(converted_value))  # type: ignore
         try:
-            converted_value = eth_utils.to_checksum_address(converted_value)
+            converted_value = cchecksum.to_checksum_address(converted_value)
         except ValueError:
             raise ValueError(f"'{value}' is not a valid ETH address") from None
         return super().__new__(cls, converted_value)  # type: ignore

brownie/network/contract.py

@@ -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
@@ -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
@@ -1258,7 +1266,7 @@ def subscribe(
     ) -> None:
         """
         Subscribe to event with a name matching 'event_name', calling the 'callback'
-        function on new occurence giving as parameter the event log receipt.
+        function on new occurrence giving as parameter the event log receipt.
 
         Args:
             event_name (str): Name of the event to subscribe to.
@@ -1285,10 +1293,10 @@ def get_sequence(
 
         Returns:
             if 'event_type' is specified:
-                [list]: List of events of type 'event_type' that occured between
+                [list]: List of events of type 'event_type' that occurred between
                 'from_block' and 'to_block'.
             else:
-                event_logbook [dict]: Dictionnary of events of the contract that occured
+                event_logbook [dict]: Dictionary of events of the contract that occurred
                 between 'from_block' and 'to_block'.
         """
         if to_block is None or to_block > web3.eth.block_number:
@@ -1315,7 +1323,7 @@ def listen(self, event_name: str, timeout: float = 0) -> Coroutine:
         'event_name' occurs. If timeout is superior to zero and no event matching
         'event_name' has occured, the Coroutine ends when the timeout is reached.
 
-        The Coroutine return value is an AttributeDict filled with the following fileds :
+        The Coroutine return value is an AttributeDict filled with the following fields :
             - 'event_data' (AttributeDict): The event log receipt that was caught.
             - 'timed_out' (bool): False if the event did not timeout, else True
 

brownie/network/event.py

@@ -502,7 +502,7 @@ def _decode_ds_note(log, contract):  # type: ignore
     if selector.hex() not in contract.selectors or sum(tail):
         return
     name = contract.selectors[selector.hex()]
-    data = bytes.fromhex(log.data[2:])
+    data = bytes.fromhex(log.data[2:]) if isinstance(log.data, str) else log.data
     # data uses ABI encoding of [uint256, bytes] or [bytes] in different versions
     # instead of trying them all, assume the payload starts from selector
     try:

brownie/network/middlewares/geth_poa.py

@@ -10,9 +10,12 @@
 class GethPOAMiddleware(BrownieMiddlewareABC):
     @classmethod
     def get_layer(cls, w3: Web3, network_type: str) -> Optional[int]:
-        block_ident = "latest" if network_type == "live" else 0
+        # NOTE: 0 because Ganache sometimes injects a block of their own. It doesn't have the extra data that we are checking for.
+        # "latest" because On Polygon networks, anvil in forked development mode doesn't throw ExtraDataLengthError on the first block.
+        block_idents = ("latest",) if network_type == "live" else (0, "latest")
         try:
-            w3.eth.get_block(block_ident)
+            for block_ident in block_idents:
+                w3.eth.get_block(block_ident)
             return None
         except ExtraDataLengthError:
             return -1

brownie/network/state.py

@@ -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)

brownie/network/transaction.py

@@ -216,10 +216,12 @@ def __init__(
         # await confirmation of tx in a separate thread which is blocking if
         # required_confs > 0 or tx has already confirmed (`blockNumber` != None)
         confirm_thread = threading.Thread(
-            target=self._await_confirmation, args=(tx["blockNumber"], required_confs), daemon=True
+            target=self._await_confirmation,
+            args=(tx.get("blockNumber"), required_confs),
+            daemon=True,
         )
         confirm_thread.start()
-        if is_blocking and (required_confs > 0 or tx["blockNumber"]):
+        if is_blocking and (required_confs > 0 or tx.get("blockNumber")):
             confirm_thread.join()
 
     def __repr__(self) -> str:
@@ -403,17 +405,22 @@ def wait(self, required_confs: int) -> None:
             print(f"This transaction already has {self.confirmations} confirmations.")
             return
 
+        if self.nonce is not None:
+            # if we know the transaction nonce, it's more efficient to watch the tx count
+            # this (i hope) also fixes a longstanding bug that sometimes gave an incorrect
+            # "tx dropped without known replacement" error due to a race condition
+            while web3.eth.get_transaction_count(str(self.sender)) <= self.nonce:
+                time.sleep(1)
+
         while True:
             try:
                 tx: Dict = web3.eth.get_transaction(self.txid)
                 break
             except TransactionNotFound:
                 if self.nonce is not None:
-                    sender_nonce = web3.eth.get_transaction_count(str(self.sender))
-                    if sender_nonce > self.nonce:
-                        self.status = Status(-2)
-                        self._confirmed.set()
-                        return
+                    self.status = Status(-2)
+                    self._confirmed.set()
+                    return
                 time.sleep(1)
 
         self._await_confirmation(tx["blockNumber"], required_confs)
@@ -508,7 +515,7 @@ def _await_confirmation(self, block_number: int = None, required_confs: int = 1)
                 # check if tx is still in mempool, this will raise otherwise
                 tx = web3.eth.get_transaction(self.txid)
                 self.block_number = None
-                return self._await_confirmation(tx["blockNumber"], required_confs)
+                return self._await_confirmation(tx.get("blockNumber"), required_confs)
             if required_confs - self.confirmations != remaining_confs:
                 remaining_confs = required_confs - self.confirmations
                 if not self._silent:

brownie/project/compiler/solidity.py

@@ -93,7 +93,7 @@ def set_solc_version(version: Union[str, Version]) -> str:
 def install_solc(*versions: Union[Version, str]) -> None:
     """Installs solc versions."""
     for version in versions:
-        solcx.install_solc(version, show_progress=True)
+        solcx.install_solc(version, show_progress=False)
 
 
 def get_abi(contract_source: str, allow_paths: Optional[str] = None) -> Dict:

brownie/project/compiler/utils.py

@@ -8,6 +8,13 @@
 
 def expand_source_map(source_map_str: str) -> List:
     # Expands the compressed sourceMap supplied by solc into a list of lists
+
+    if isinstance(source_map_str, dict):
+        # NOTE: vyper >= 0.4 gives us a dict that contains the source map
+        source_map_str = source_map_str["pc_pos_map_compressed"]
+    if not isinstance(source_map_str, str):
+        raise TypeError(source_map_str)
+
     source_map: List = [_expand_row(i) if i else None for i in source_map_str.split(";")]
     for i, value in enumerate(source_map[1:], 1):
         if value is None: