Merge pull request #316 from derekpierre/ape-0.8

Ape 0.8

.prettierignore

@@ -3,4 +3,5 @@
 **/contracts/contracts/NuCypherToken.sol
 **/contracts/test/proxy/
 **/contracts/test/StakingEscrowTestSet.sol
-**/.cache
+**/.cache
+Pipfile.lock

ape-config.yaml

@@ -27,17 +27,10 @@ dependencies:
 solidity:
   version: 0.8.23
   evm_version: paris
-  import_remapping:
-    - "@openzeppelin/contracts=openzeppelin/v5.0.0"
-    - "@openzeppelin-upgradeable/contracts=openzeppelin-upgradeable/v5.0.0"
-    - "@fx-portal/contracts=fx-portal/v1.0.5"
-    - "@threshold/contracts=threshold/v1.2.1"
-
 
 ethereum:
   mainnet:
-    transaction_acceptance_timeout: 600  # 10 minutes
-
+    transaction_acceptance_timeout: 600 # 10 minutes
 
 test:
   mnemonic: test test test test test test test test test test test junk

deployment/registry.py

@@ -64,7 +64,7 @@ def _get_entry(
 ) -> RegistryEntry:
     contract_abi = _get_abi(contract_instance)
     contract_name = _get_name(contract_instance=contract_instance, registry_names=registry_names)
-    receipt = contract_instance.receipt
+    receipt = contract_instance.creation_metadata.receipt
     entry = RegistryEntry(
         name=contract_name,
         address=to_checksum_address(contract_instance.address),

requirements.txt

@@ -1,145 +1,140 @@
 -i https://pypi.org/simple
-aiohttp==3.9.3; python_version >= '3.8'
+aiohappyeyeballs==2.4.0; python_version >= '3.8'
+aiohttp==3.10.5; python_version >= '3.8'
 aiosignal==1.3.1; python_version >= '3.7'
-annotated-types==0.6.0; python_version >= '3.8'
-ape-etherscan==0.7.2; python_version >= '3.8' and python_version < '4'
-ape-infura==0.7.2; python_version >= '3.8' and python_version < '4'
-ape-polygon==0.7.2; python_version >= '3.8' and python_version < '4'
-ape-solidity==0.7.1; python_version >= '3.8' and python_version < '4'
+annotated-types==0.7.0; python_version >= '3.8'
+ape-etherscan==0.8.2; python_version >= '3.9' and python_version < '4'
+ape-infura==0.8.1; python_version >= '3.9' and python_version < '4'
+ape-polygon==0.8.0; python_version >= '3.9' and python_version < '4'
+ape-solidity==0.8.3; python_version >= '3.9' and python_version < '4'
 asn1crypto==1.5.1
 asttokens==2.4.1
-attrs==23.2.0; python_version >= '3.7'
+attrs==24.2.0; python_version >= '3.7'
 base58==1.0.3
 bitarray==2.9.2
-black==24.3.0; python_version >= '3.8'
+black==24.8.0; python_version >= '3.8'
 bump2version==1.0.1; python_version >= '3.5'
 cached-property==1.5.2
-cachetools==5.3.3; python_version >= '3.7'
-certifi==2024.2.2; python_version >= '3.6'
-cffi==1.16.0; platform_python_implementation != 'PyPy'
+cachetools==5.5.0; python_version >= '3.7'
+certifi==2024.7.4; python_version >= '3.6'
+cffi==1.17.0; python_version >= '3.8'
 cfgv==3.4.0; python_version >= '3.8'
 chardet==5.2.0; python_version >= '3.7'
 charset-normalizer==3.3.2; python_full_version >= '3.7.0'
+ckzg==1.0.2
 click==8.1.7; python_version >= '3.7'
-coincurve==19.0.1; python_version >= '3.8'
+coincurve==20.0.0; python_version >= '3.8'
 colorama==0.4.6; python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3, 3.4, 3.5, 3.6'
-cryptography==42.0.5; python_version >= '3.7'
+cryptography==43.0.0; python_version >= '3.7'
 cytoolz==0.12.3; implementation_name == 'cpython'
 dataclassy==0.11.1; python_version >= '3.6'
 decorator==5.1.1; python_version >= '3.5'
-deprecated==1.2.14; python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3'
 distlib==0.3.8
-eip712==0.2.4; python_version >= '3.8' and python_version < '4'
-eth-abi==4.2.1; python_full_version >= '3.7.2' and python_version < '4'
-eth-account==0.10.0; python_version >= '3.7' and python_version < '4'
-eth-ape==0.7.13; python_version >= '3.8' and python_version < '4'
-eth-bloom==3.0.0; python_version >= '3.8' and python_version < '4'
+eip712==0.2.7; python_version >= '3.8' and python_version < '4'
+eth-abi==5.1.0; python_version >= '3.8' and python_version < '4'
+eth-account==0.11.3; python_version >= '3.8' and python_version < '4'
+eth-ape==0.8.12; python_version >= '3.9' and python_version < '4'
+eth-bloom==3.0.1; python_version >= '3.8' and python_version < '4'
 eth-hash[pycryptodome,pysha3]==0.7.0; python_version >= '3.8' and python_version < '4'
-eth-keyfile==0.8.0; python_version >= '3.8' and python_version < '4'
-eth-keys==0.4.0
-eth-pydantic-types==0.1.0a5; python_version >= '3.8' and python_version < '4'
+eth-keyfile==0.8.1; python_version >= '3.8' and python_version < '4'
+eth-keys==0.5.1; python_version >= '3.8' and python_version < '4'
+eth-pydantic-types==0.1.0; python_version >= '3.8' and python_version < '4'
 eth-rlp==1.0.1; python_version >= '3.8' and python_version < '4'
-eth-tester[py-evm]==0.9.1b2
+eth-tester[py-evm]==0.11.0b2
 eth-typing==3.5.2; python_full_version >= '3.7.2' and python_version < '4'
 eth-utils==2.3.1; python_version >= '3.7' and python_version < '4'
-ethpm-types==0.6.7; python_version >= '3.8' and python_version < '4'
-evm-trace==0.1.2; python_version >= '3.8' and python_version < '4'
-evmchains==0.0.4; python_version >= '3.8'
+ethpm-types==0.6.14; python_version >= '3.8' and python_version < '4'
+evm-trace==0.2.0; python_version >= '3.9' and python_version < '4'
+evmchains==0.0.11; python_version >= '3.8'
 executing==2.0.1; python_version >= '3.5'
-filelock==3.13.3; python_version >= '3.8'
-flake8==7.0.0; python_full_version >= '3.8.1'
+filelock==3.15.4; python_version >= '3.8'
+flake8==7.1.1; python_full_version >= '3.8.1'
 frozenlist==1.4.1; python_version >= '3.8'
 hexbytes==0.3.1; python_version >= '3.7' and python_version < '4'
-identify==2.5.35; python_version >= '3.8'
-idna==3.6; python_version >= '3.5'
-ijson==3.2.3
-importlib-metadata==7.1.0; python_version >= '3.8'
+identify==2.6.0; python_version >= '3.8'
+idna==3.7; python_version >= '3.5'
+ijson==3.3.0
 iniconfig==2.0.0; python_version >= '3.7'
-ipython==8.23.0; python_version >= '3.10'
-isort==5.13.2; python_full_version >= '3.8.0'
+ipython==8.26.0; python_version >= '3.10'
+isort==6.0.0b2; python_full_version >= '3.7.0'
 jedi==0.19.1; python_version >= '3.6'
-jsonschema==4.21.1; python_version >= '3.8'
+jsonschema==4.23.0; python_version >= '3.8'
 jsonschema-specifications==2023.12.1; python_version >= '3.8'
 lazyasd==0.1.4
 lru-dict==1.2.0
 markdown-it-py==3.0.0; python_version >= '3.8'
-matplotlib-inline==0.1.6; python_version >= '3.5'
+matplotlib-inline==0.1.7; python_version >= '3.8'
 mccabe==0.7.0; python_version >= '3.6'
 mdurl==0.1.2; python_version >= '3.7'
 morphys==1.0
 msgspec==0.18.6; python_version >= '3.8'
 multidict==6.0.5; python_version >= '3.7'
 mypy-extensions==1.0.0; python_version >= '3.5'
-nodeenv==1.8.0; python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3, 3.4, 3.5, 3.6'
+nodeenv==1.9.1; python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3, 3.4, 3.5, 3.6'
 nucypher-core==0.14.0
-numpy==1.26.4; python_version >= '3.10'
+numpy==1.26.4; python_version >= '3.9'
 packaging==23.2; python_version >= '3.7'
-pandas==1.5.3; python_version >= '3.8'
-parsimonious==0.9.0
-parso==0.8.3; python_version >= '3.6'
+pandas==2.2.2; python_version >= '3.9'
+parsimonious==0.10.0
+parso==0.8.4; python_version >= '3.6'
 pathspec==0.12.1; python_version >= '3.8'
 pexpect==4.9.0; sys_platform != 'win32' and sys_platform != 'emscripten'
-platformdirs==4.2.0; python_version >= '3.8'
-pluggy==1.4.0; python_version >= '3.8'
-pre-commit==3.7.0; python_version >= '3.9'
-prompt-toolkit==3.0.43; python_full_version >= '3.7.0'
-protobuf==5.26.1; python_version >= '3.8'
+platformdirs==4.2.2; python_version >= '3.8'
+pluggy==1.5.0; python_version >= '3.8'
+pre-commit==3.8.0; python_version >= '3.9'
+prompt-toolkit==3.0.47; python_full_version >= '3.7.0'
+protobuf==5.28.0rc2; python_version >= '3.8'
 ptyprocess==0.7.0
-pure-eval==0.2.2
+pure-eval==0.2.3
 py-cid==0.3.0
-py-ecc==6.0.0; python_version >= '3.6' and python_version < '4'
-py-evm==0.7.0a4
-py-geth==4.4.0; python_version >= '3.8' and python_version < '4'
+py-ecc==7.0.1; python_version >= '3.8' and python_version < '4'
+py-evm==0.10.1b1; python_version >= '3.8' and python_version < '4'
+py-geth==5.0.0; python_version >= '3.8' and python_version < '4'
 py-multibase==1.0.3
 py-multicodec==0.2.1
 py-multihash==0.2.3
-py-solc-x==2.0.2; python_version >= '3.8' and python_version < '4'
-pycodestyle==2.11.1; python_version >= '3.8'
+py-solc-x==2.0.3; python_version >= '3.8' and python_version < '4'
+pycodestyle==2.12.1; python_version >= '3.8'
 pycparser==2.22; python_version >= '3.8'
 pycryptodome==3.20.0
-pydantic==2.5.3; python_version >= '3.7'
-pydantic-core==2.14.6; python_version >= '3.7'
-pydantic-settings==2.2.1; python_version >= '3.8'
-pyethash==0.1.27
+pydantic==2.8.2; python_version >= '3.8'
+pydantic-core==2.20.1; python_version >= '3.8'
+pydantic-settings==2.4.0; python_version >= '3.8'
 pyflakes==3.2.0; python_version >= '3.8'
-pygithub==1.59.1; python_version >= '3.7'
-pygments==2.17.2; python_version >= '3.7'
-pyjwt[crypto]==2.8.0; python_version >= '3.7'
-pynacl==1.5.0; python_version >= '3.6'
+pygments==2.18.0; python_version >= '3.8'
 pyproject-api==1.6.1; python_version >= '3.8'
-pytest==7.4.4; python_version >= '3.7'
+pytest==8.3.2; python_version >= '3.8'
 python-baseconv==1.2.2
 python-dateutil==2.9.0.post0; python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2'
 python-dotenv==1.0.1; python_version >= '3.8'
 pytz==2024.1
 pyunormalize==15.1.0; python_version >= '3.6'
-pyyaml==6.0.1; python_version >= '3.6'
-referencing==0.34.0; python_version >= '3.8'
-regex==2023.12.25; python_version >= '3.7'
-requests==2.31.0; python_version >= '3.7'
+pyyaml==6.0.2; python_version >= '3.8'
+referencing==0.35.1; python_version >= '3.8'
+regex==2024.7.24; python_version >= '3.8'
+requests==2.32.3; python_version >= '3.8'
 rich==13.7.1; python_full_version >= '3.7.0'
-rlp==3.0.0
-rpds-py==0.18.0; python_version >= '3.8'
+rlp==4.0.1; python_version >= '3.8' and python_version < '4'
+rpds-py==0.20.0; python_version >= '3.8'
 safe-pysha3==1.0.4
 semantic-version==2.10.0; python_version >= '2.7'
-setuptools==69.2.0; python_version >= '3.8'
 six==1.16.0; python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2'
 sortedcontainers==2.4.0
-sqlalchemy==2.0.29; python_version >= '3.7'
+sqlalchemy==2.0.32; python_version >= '3.7'
 stack-data==0.6.3
 toolz==0.12.1; python_version >= '3.7'
-tox==4.14.2; python_version >= '3.8'
-tqdm==4.66.2; python_version >= '3.7'
-traitlets==5.14.2; python_version >= '3.8'
-trie==2.2.0; python_version >= '3.7' and python_version < '4'
-typing-extensions==4.10.0; python_version >= '3.8'
-urllib3==2.2.1; python_version >= '3.8'
+tox==4.15.1; python_version >= '3.8'
+tqdm==4.66.5; python_version >= '3.7'
+traitlets==5.14.3; python_version >= '3.8'
+trie==3.0.1; python_version >= '3.8' and python_version < '4'
+types-requests==2.32.0.20240712; python_version >= '3.8'
+typing-extensions==4.12.2; python_version >= '3.8'
+tzdata==2024.1; python_version >= '2'
+urllib3==2.2.2; python_version >= '3.8'
 varint==1.0.2
-virtualenv==20.25.1; python_version >= '3.7'
+virtualenv==20.26.3; python_version >= '3.7'
 watchdog==3.0.0; python_version >= '3.7'
 wcwidth==0.2.13
-web3[tester]==6.16.0; python_full_version >= '3.7.2'
-websockets==12.0; python_version >= '3.8'
-wrapt==1.16.0; python_version >= '3.6'
+web3[tester]==6.20.1; python_full_version >= '3.7.2'
+websockets==13.0; python_version >= '3.8'
 yarl==1.9.4; python_version >= '3.7'
-zipp==3.18.1; python_version >= '3.8'