Merge pull request #44 from derekpierre/rc-1

Porter RC-1 Candidate

Pipfile

@@ -7,18 +7,19 @@ name = "pypi"
 python_version = "3"
 
 [packages]
-nucypher = {git = "https://github.com/nucypher/nucypher.git", ref = "dkg-dev-15"}
+nucypher = {git = "https://github.com/nucypher/nucypher.git", ref = "v7.0.0-rc.1"}
 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-15", extras = ["dev"]}  # needed for testerchain, and must be editable
+nucypher = {git = "https://github.com/nucypher/nucypher.git", editable = true, ref = "v7.0.0-rc.1", extras = ["dev"]}  # needed for testerchain, and must be editable
 pytest = "<7"  # match with nucypher/nucypher
 pytest-cov = "*"
 pytest-mock = "*"
 # Tools
 pre-commit = "2.12.1"
 coverage = "<=6.5.0"
+maya = "*"
 
 
 [pipenv]

dev-requirements.txt

@@ -85,7 +85,7 @@ msgspec==0.18.2 ; python_version >= '3.8'
 multidict==5.2.0 ; python_version >= '3.6'
 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@ff383dc663c7100cf2ae6f899ed268213b6c653d#egg=nucypher
+git+https://github.com/nucypher/nucypher.git@2b1c7d6df207ecd239db4331f452332dbcd6a8a9#egg=nucypher
 nucypher-core==0.12.0
 numpy==1.24.4 ; python_version >= '3.8'
 packaging==23.1 ; python_version >= '3.7'
@@ -143,7 +143,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.10.0 ; python_version >= '3.8'
 semantic-version==2.10.0 ; python_version >= '2.7'
-sentry-sdk==1.31.0
+sentry-sdk==1.32.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'

requirements.txt

@@ -55,7 +55,7 @@ msgpack==1.0.5
 msgpack-python==0.5.6
 multidict==5.2.0 ; python_version >= '3.6'
 mypy-extensions==1.0.0 ; python_version >= '3.5'
-git+https://github.com/nucypher/nucypher.git@ff383dc663c7100cf2ae6f899ed268213b6c653d#egg=nucypher
+git+https://github.com/nucypher/nucypher.git@2b1c7d6df207ecd239db4331f452332dbcd6a8a9#egg=nucypher
 nucypher-core==0.12.0
 packaging==23.1 ; python_version >= '3.7'
 parsimonious==0.9.0

tests/conftest.py

@@ -2,6 +2,7 @@
 from typing import Iterable, List, Optional, Tuple
 from unittest.mock import MagicMock
 
+import maya
 import pytest
 from click.testing import CliRunner
 from eth_typing import ChecksumAddress
@@ -312,13 +313,14 @@ def dkg_setup(
         )
         ursula.dkg_storage.store_public_key(ritual_id=ritual_id, public_key=public_key)
 
+    now = maya.now()
     ritual = CoordinatorAgent.Ritual(
         initiator=get_random_checksum_address(),
         authority=get_random_checksum_address(),
         access_controller=get_random_checksum_address(),
         dkg_size=num_shares,
-        init_timestamp=123456,
-        end_timestamp=1234567,
+        init_timestamp=now.epoch,
+        end_timestamp=now.add(days=1).epoch,
         threshold=threshold,
         total_transcripts=num_shares,
         total_aggregations=num_shares,