Merge pull request #34 from derekpierre/taco-porter-update

TACo Updates

Pipfile

@@ -7,12 +7,12 @@ name = "pypi"
 python_version = "3"
 
 [packages]
-nucypher = {git = "https://github.com/nucypher/nucypher.git", ref = "dkg-dev-8"}
-nucypher-core = ">=0.11.0"  # must be the same as nucypher
+nucypher = {git = "https://github.com/derekpierre/nucypher.git", ref = "mock-polygon"}
+nucypher-core = "==0.12.0"  # must be the same as nucypher
 flask-cors = "*"
 
 [dev-packages]
-nucypher = {git = "https://github.com/nucypher/nucypher.git", editable = true, ref = "dkg-dev-8", extras = ["dev"]}  # needed for testerchain, and must be editable
+nucypher = {git = "https://github.com/derekpierre/nucypher.git", editable = true, ref = "mock-polygon", extras = ["dev"]}  # needed for testerchain, and must be editable
 pytest = "<7"  # match with nucypher/nucypher
 pytest-cov = "*"
 pytest-mock = "*"

dev-requirements.txt

@@ -1,94 +1,93 @@
 -i https://pypi.python.org/simple
 aiohttp==3.8.2 ; python_version >= '3.6'
 aiosignal==1.3.1 ; python_version >= '3.7'
-ape-solidity==0.6.5 ; python_version >= '3.8' and python_version < '4'
+ape-solidity==0.6.8 ; python_version >= '3.8' and python_version < '4'
 appdirs==1.4.4
 appnope==0.1.3
 asttokens==2.2.1
-async-timeout==4.0.2 ; python_version >= '3.6'
+async-timeout==4.0.3 ; python_version >= '3.7'
 attrs==23.1.0 ; python_version >= '3.7'
 autobahn==23.1.2 ; python_version >= '3.7'
 automat==22.10.0
 backcall==0.2.0
 backports.zoneinfo==0.2.1 ; python_version >= '3.6' and python_version < '3.9'
 base58==1.0.3
-bitarray==2.7.4
+bitarray==2.8.1
 bytestring-splitter==2.4.1
 cached-property==1.5.2
-certifi==2023.5.7 ; python_version >= '3.6'
+certifi==2023.7.22 ; python_version >= '3.6'
 cffi==1.15.1
-cfgv==3.3.1 ; python_full_version >= '3.6.1'
+cfgv==3.4.0 ; python_version >= '3.8'
 charset-normalizer==2.1.1 ; python_full_version >= '3.6.0'
-click==8.1.3 ; python_version >= '3.7'
+click==8.1.7 ; python_version >= '3.7'
 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'
 commonmark==0.9.1
 constant-sorrow==0.1.0a9 ; python_version >= '3'
 constantly==15.1.0
 coverage==6.5.0
-cryptography==41.0.1 ; python_version >= '3.7'
-cytoolz==0.12.1 ; python_version >= '3.6'
+cryptography==41.0.3 ; python_version >= '3.7'
+cytoolz==0.12.2 ; python_version >= '3.6'
 dataclassy==0.11.1 ; python_version >= '3.6'
 dateparser==1.1.8 ; python_version >= '3.7'
 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.6
+distlib==0.3.7
 eip712==0.2.1 ; python_version >= '3.8' and python_version < '4'
-eip712-structs==1.1.0
-eth-abi==4.0.0 ; python_version >= '3.7' and python_version < '4'
+eth-abi==4.2.0 ; python_full_version >= '3.7.2' and python_version < '4'
 eth-account==0.8.0 ; python_version >= '3.6' and python_version < '4'
-eth-ape==0.6.10 ; python_version >= '3.8' and python_version < '4'
+eth-ape==0.6.19 ; python_version >= '3.8' and python_version < '4'
 eth-bloom==2.0.0 ; python_version >= '3.7' and python_version < '4'
-eth-hash==0.5.1 ; python_version >= '3.7' and python_version < '4'
+eth-hash==0.5.2 ; python_version >= '3.7' and python_version < '4'
 eth-keyfile==0.6.1
 eth-keys==0.4.0
 eth-rlp==0.3.0 ; python_version >= '3.7' and python_version < '4'
-eth-tester==0.9.0b1 ; python_full_version >= '3.6.8' and python_version < '4'
-eth-typing==3.3.0 ; python_full_version >= '3.7.2' and python_version < '4'
-eth-utils==2.1.0 ; python_version >= '3.7' and python_version < '4'
-ethpm-types==0.5.2 ; python_version >= '3.8' and python_version < '4'
-evm-trace==0.1.0a20 ; python_version >= '3.8' and python_version < '4'
-exceptiongroup==1.1.1 ; python_version >= '3.7'
+eth-tester==0.9.1b1 ; python_full_version >= '3.6.8' and python_version < '4'
+eth-typing==3.4.0 ; python_full_version >= '3.7.2' and python_version < '4'
+eth-utils==2.2.0 ; python_version >= '3.7' and python_version < '4'
+ethpm-types==0.5.4 ; python_version >= '3.8' and python_version < '4'
+evm-trace==0.1.0a24 ; python_version >= '3.8' and python_version < '4'
+exceptiongroup==1.1.3 ; python_version >= '3.7'
 executing==1.2.0
-filelock==3.12.0 ; python_version >= '3.7'
+filelock==3.12.3 ; python_version >= '3.8'
 flask==2.2.5 ; python_version >= '3.7'
-frozenlist==1.3.3 ; python_version >= '3.7'
-greenlet==2.0.2 ; python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3, 3.4'
+frozenlist==1.4.0 ; python_version >= '3.8'
+greenlet==3.0.0a1 ; python_version >= '3.7'
 hendrix==4.0.0
-hexbytes==0.3.0 ; python_version >= '3.7' and python_version < '4'
-humanize==4.6.0 ; python_version >= '3.7'
+hexbytes==0.3.1 ; python_version >= '3.7' and python_version < '4'
+humanize==4.8.0 ; python_version >= '3.8'
 hyperlink==21.0.0
-hypothesis==6.76.0 ; python_version >= '3.7'
-identify==2.5.24 ; python_version >= '3.7'
+hypothesis==6.83.0 ; python_version >= '3.8'
+identify==2.5.27 ; python_version >= '3.8'
 idna==3.4 ; python_version >= '3.5'
-ijson==3.2.0.post0
-importlib-metadata==6.6.0 ; python_version >= '3.7'
-importlib-resources==5.12.0 ; python_version >= '3.7'
+ijson==3.2.3
+importlib-metadata==6.8.0 ; python_version >= '3.8'
+importlib-resources==5.13.0 ; python_version >= '3.8'
 incremental==22.10.0
 iniconfig==2.0.0 ; python_version >= '3.7'
 ipython==8.12.2 ; python_version >= '3.8'
 itsdangerous==2.1.2 ; python_version >= '3.7'
-jedi==0.18.2 ; python_version >= '3.6'
+jedi==0.19.0 ; python_version >= '3.6'
 jinja2==3.0.3 ; python_version >= '3.6'
-jsonschema==4.18.0a9 ; python_version >= '3.8'
-jsonschema-specifications==2023.5.2 ; python_version >= '3.8'
+jsonschema==4.19.0 ; python_version >= '3.8'
+jsonschema-specifications==2023.7.1 ; python_version >= '3.8'
 lazyasd==0.1.4
 lru-dict==1.2.0
 mako==1.2.4 ; python_version >= '3.7'
 markupsafe==2.1.3 ; python_version >= '3.7'
-marshmallow==3.19.0 ; python_version >= '3.7'
+marshmallow==3.20.1 ; python_version >= '3.8'
 matplotlib-inline==0.1.6 ; python_version >= '3.5'
 maya==0.6.1
 mnemonic==0.20 ; python_version >= '3.5'
 morphys==1.0
 msgpack==1.0.5
 msgpack-python==0.5.6
-msgspec==0.15.1 ; python_version >= '3.8'
+msgspec==0.18.2 ; python_version >= '3.8'
 multidict==5.2.0 ; python_version >= '3.6'
-mypy-extensions==0.4.4 ; python_version >= '2.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'
-git+https://github.com/nucypher/nucypher.git@788073d93cdc5a94568e004a6f7b7bf342b1805d#egg=nucypher
-nucypher-core==0.11.0
-numpy==1.24.3 ; python_version >= '3.8'
+git+https://github.com/derekpierre/nucypher.git@4e9cc2c445bd4eb8f6aeae5d020c04898c6139b5#egg=nucypher
+nucypher-core==0.12.0
+numpy==1.24.4 ; python_version >= '3.8'
 packaging==23.1 ; python_version >= '3.7'
 pandas==1.5.3 ; python_version >= '3.8'
 parsimonious==0.9.0
@@ -97,19 +96,19 @@ pendulum==3.0.0a1 ; python_version >= '3.7' and python_version < '4.0'
 pexpect==4.8.0
 pickleshare==0.7.5
 pkgutil-resolve-name==1.3.10 ; python_version >= '3.6'
-platformdirs==3.5.1 ; python_version >= '3.7'
-pluggy==1.0.0 ; python_version >= '3.6'
-pre-commit==3.3.2
+platformdirs==3.10.0 ; python_version >= '3.7'
+pluggy==1.3.0 ; python_version >= '3.8'
+pre-commit==3.3.3
 prometheus-client==0.17.1 ; python_version >= '3.6'
-prompt-toolkit==3.0.38 ; python_full_version >= '3.7.0'
-protobuf==4.23.2 ; python_version >= '3.7'
+prompt-toolkit==3.0.39 ; python_full_version >= '3.7.0'
+protobuf==4.24.2 ; python_version >= '3.7'
 ptyprocess==0.7.0
 pure-eval==0.2.2
 py==1.11.0 ; python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3, 3.4'
 py-cid==0.3.0
 py-ecc==6.0.0 ; python_version >= '3.6' and python_version < '4'
-py-evm==0.7.0a2
-py-geth==3.12.0 ; python_version >= '3'
+py-evm==0.7.0a4
+py-geth==3.13.0 ; python_version >= '3.7' and python_version < '4'
 py-multibase==1.0.3
 py-multicodec==0.2.1
 py-multihash==0.2.3
@@ -119,60 +118,61 @@ pyasn1-modules==0.3.0 ; python_version >= '2.7' and python_version not in '3.0,
 pychalk==2.0.1
 pycparser==2.21
 pycryptodome==3.18.0 ; python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3, 3.4'
-pydantic==1.10.8 ; python_version >= '3.7'
+pydantic==1.10.12 ; python_version >= '3.7'
 pyethash==0.1.27
-pygithub==1.58.2 ; python_version >= '3.7'
-pygments==2.15.1 ; python_version >= '3.7'
-pyjwt[crypto]==2.7.0 ; python_version >= '3.7'
+pygithub==1.59.1 ; python_version >= '3.7'
+pygments==2.16.1 ; python_version >= '3.7'
+pyjwt[crypto]==2.8.0 ; python_version >= '3.7'
 pynacl==1.5.0 ; python_version >= '3.6'
 pyopenssl==23.2.0 ; python_version >= '3.6'
 pysha3==1.0.2
 pytest==6.2.5
 pytest-cov==4.1.0
-pytest-mock==3.10.0
+pytest-mock==3.11.1
 pytest-timeout==2.1.0 ; python_version >= '3.6'
 pytest-twisted==1.14.0 ; python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3, 3.4'
 python-baseconv==1.2.2
 python-dateutil==2.8.2 ; python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2'
 pytz==2023.3
-pyyaml==6.0 ; python_version >= '3.6'
-referencing==0.29.0 ; python_version >= '3.8'
-regex==2023.6.3 ; python_version >= '3.6'
+pyunormalize==15.0.0 ; python_version >= '3.6'
+pyyaml==6.0.1 ; python_version >= '3.6'
+referencing==0.30.2 ; python_version >= '3.8'
+regex==2023.8.8 ; python_version >= '3.6'
 requests==2.31.0 ; python_version >= '3.7'
 rich==12.6.0 ; python_full_version >= '3.6.3' and python_full_version < '4.0.0'
 rlp==3.0.0
-rpds-py==0.7.1 ; python_version >= '3.8'
+rpds-py==0.10.0 ; python_version >= '3.8'
 semantic-version==2.10.0 ; python_version >= '2.7'
-sentry-sdk==1.29.2
-service-identity==21.1.0
-setuptools==67.8.0 ; python_version >= '3.7'
+sentry-sdk==1.31.0
+service-identity==23.1.0 ; python_version >= '3.8'
+setuptools==68.1.2 ; python_version >= '3.8'
 six==1.16.0 ; python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2'
 snaptime==0.2.4
 sortedcontainers==2.4.0
-sqlalchemy==2.0.15 ; python_version >= '3.7'
+sqlalchemy==2.0.20 ; python_version >= '3.7'
 stack-data==0.6.2
 tabulate==0.9.0 ; python_version >= '3.7'
-time-machine==2.9.0 ; python_version >= '3.7'
+time-machine==2.12.0 ; python_version >= '3.8'
 toml==0.10.2 ; python_version >= '2.6' and python_version not in '3.0, 3.1, 3.2'
 tomli==2.0.1 ; python_version >= '3.7'
 toolz==0.12.0 ; python_version >= '3.5'
-tqdm==4.65.0 ; python_version >= '3.7'
+tqdm==4.66.1 ; python_version >= '3.7'
 traitlets==5.9.0 ; python_version >= '3.7'
-trie==2.1.0 ; python_version >= '3.7' and python_version < '4'
-twisted==22.10.0 ; python_full_version >= '3.7.1'
+trie==2.1.1 ; python_version >= '3.7' and python_version < '4'
+twisted==23.8.0 ; python_full_version >= '3.7.1'
 txaio==23.1.1 ; python_version >= '3.7'
-typing-extensions==4.6.3 ; python_version >= '3.7'
+typing-extensions==4.7.1 ; python_version >= '3.7'
 tzdata==2023.3 ; python_version >= '2'
 tzlocal==5.0.1 ; python_version >= '3.7'
-urllib3==2.0.3 ; python_version >= '3.7'
+urllib3==2.0.4 ; python_version >= '3.7'
 varint==1.0.2
-virtualenv==20.23.0 ; python_version >= '3.7'
-watchdog==2.3.1 ; python_version >= '3.6'
+virtualenv==20.24.4 ; python_version >= '3.7'
+watchdog==3.0.0 ; python_version >= '3.7'
 wcwidth==0.2.6
-web3==6.4.0 ; python_full_version >= '3.7.2'
+web3==6.9.0 ; python_full_version >= '3.7.2'
 websockets==11.0.3 ; python_version >= '3.7'
-werkzeug==2.3.4 ; python_version >= '3.8'
+werkzeug==2.3.7 ; python_version >= '3.8'
 wrapt==1.15.0 ; python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3, 3.4'
 yarl==1.9.2 ; python_version >= '3.7'
-zipp==3.15.0 ; python_version >= '3.7'
-zope.interface==6.1a2 ; python_version >= '3.7'
+zipp==3.16.2 ; python_version >= '3.8'
+zope-interface==6.1a2 ; python_version >= '3.7'

porter/__about__.py

@@ -12,7 +12,7 @@
 
 __url__ = "https://github.com/nucypher/nucypher-porter"
 
-__summary__ = 'Pipe for PRE on Threshold Network'
+__summary__ = "Pipe for TACo on Threshold Network"
 
 __version__ = "1.0.0"
 

porter/main.py

@@ -5,7 +5,7 @@
 from eth_typing import ChecksumAddress
 from eth_utils import to_checksum_address
 from flask import Response, request
-from nucypher.blockchain.eth.agents import ContractAgency, PREApplicationAgent
+from nucypher.blockchain.eth.agents import ContractAgency, TACoApplicationAgent
 from nucypher.blockchain.eth.interfaces import BlockchainInterfaceFactory
 from nucypher.blockchain.eth.registry import (
     BaseContractRegistry,
@@ -39,7 +39,7 @@
 | |   | |_| | |   | |_( (/ /| |
 |_|    \___/|_|    \___)____)_|
 
-the Pipe for PRE Application network operations
+the Pipe for TACo Application network operations
 """
 
 
@@ -98,8 +98,14 @@ def __init__(self,
             BlockchainInterfaceFactory.initialize_interface(eth_provider_uri=eth_provider_uri)
 
         self.eth_provider_uri = eth_provider_uri
-        self.registry = registry or InMemoryContractRegistry.from_latest_publication(network=domain)
-        self.application_agent = ContractAgency.get_agent(PREApplicationAgent, registry=self.registry, provider_uri=self.eth_provider_uri)
+        self.registry = registry or InMemoryContractRegistry.from_latest_publication(
+            network=domain
+        )
+        self.application_agent = ContractAgency.get_agent(
+            TACoApplicationAgent,
+            registry=self.registry,
+            provider_uri=self.eth_provider_uri,
+        )
 
         super().__init__(save_metadata=True, domain=domain, node_class=node_class, *args, **kwargs)