Coffee

.circleci/config.yml

@@ -5,12 +5,12 @@ workflows:
   test:
     jobs:
       - bundle_dependencies-36
-      - contract_unit:
+#      - mypy_type_check:
+#          requires:
+#            - bundle_dependencies-36
+      - eth_contract_unit:
           requires:
             - bundle_dependencies-36
-      - intercontract_integration:
-          requires:
-            - contract_unit
       - crypto_unit:
           requires:
               - bundle_dependencies-36
@@ -20,140 +20,141 @@ workflows:
       - keystore_unit:
           requires:
               - bundle_dependencies-36
-      - blockchain_client_unit:
+      - blockchain_interface_unit:
           requires:
               - bundle_dependencies-36
       - character:
           requires:
               - crypto_unit
               - network_unit
               - keystore_unit
+      - intercontract_integration:
+          requires:
+            - eth_contract_unit
 
-bundle_dependencies: &bundle_dependencies
-  steps:
-    - checkout
-    - restore_cache:
-        key: deps-{{ .Branch }}-{{ checksum "Pipfile" }}
-    - run:
-        name: Install Pipenv itself
-        command: pip install pipenv --upgrade
-    - run:
-        name: Install Python dependencies with Pipenv
-        command: |
-          pipenv install --three --dev --skip-lock
-    - run:
-        name: Install Solidity compiler
-        command: |
-          wget "https://github.com/ethereum/solidity/releases/download/${SOLC_VER}/solc-static-linux" -O "$(pipenv --venv)/bin/solc"
-          chmod +x "$(pipenv --venv)/bin/solc"
-        environment:
-          SOLC_VER: "v0.4.24"
-    - save_cache:
-        paths:
-          - "~/.local/share/virtualenvs/"
-        key: deps-{{ .Branch }}-{{ checksum "Pipfile" }}
-
-jobs:
-  bundle_dependencies-36:
-    <<: *bundle_dependencies
+python_36_base: &python_36_base
     working_directory: ~/nucypher-depends
     docker:
       - image: circleci/python:3.6
 
-  contract_unit:
-    parallelism: 3
-    working_directory: ~/nucypher-depends
-    docker:
-      - image: circleci/python:3.6
+jobs:
+  bundle_dependencies-36:
+    <<: *python_36_base
     steps:
       - checkout
-      - restore_cache:
-          key: deps-{{ .Branch }}-{{ checksum "Pipfile" }}
       - run:
-          name: Ethereum Contract Unit Tests
+          name: Install Python Dependencies with Pipenv
           command: |
-            pipenv run pytest --junitxml=./reports/pytest/eth-contract-unit-report.xml --cov=nucypher -v --runslow $(circleci tests glob tests/blockchain/eth/contracts/unit/test_*.py | circleci tests split --split-by=timings)
+            pipenv install --three --dev --pre --skip-lock --verbose
+            pipenv graph
+      - run:
+          name: Install Solidity Compiler
+          command: pipenv run install_solc
+      - save_cache:
+          paths:
+            - "~/.local/share/virtualenvs/"
+          key: v4-deps-{{ .Environment.CIRCLE_WORKFLOW_ID }}-{{ checksum "Pipfile" }}
+
+  blockchain_interface_unit:
+    <<: *python_36_base
+    steps:
+      - checkout
+      - restore_cache:
+          key: v4-deps-{{ .Environment.CIRCLE_WORKFLOW_ID }}-{{ checksum "Pipfile" }}
+      - run:
+          name: Blockchain Interface Tests
+          command: pipenv run pytest --cov=nucypher/blockchain/eth -v --runslow tests/blockchain/eth/interfaces tests/blockchain/eth/entities --junitxml=./reports/pytest/results.xml
       - store_test_results:
           path: ./reports/pytest/
 
-
-  intercontract_integration:
-    working_directory: ~/nucypher-depends
-    docker:
-      - image: circleci/python:3.6
+  eth_contract_unit:
+    <<: *python_36_base
+    parallelism: 4
     steps:
       - checkout
       - restore_cache:
-          key: deps-{{ .Branch }}-{{ checksum "Pipfile" }}
+          key: v4-deps-{{ .Environment.CIRCLE_WORKFLOW_ID }}-{{ checksum "Pipfile" }}
       - run:
-          name: Ethereum Inter-Contract Integration Test
+          name: Ethereum Contract Unit Tests
           command: |
-            pipenv run pytest --cov=nucypher -v --runslow tests/blockchain/eth/contracts/integration
+            pipenv run pytest --junitxml=./reports/pytest/eth-contract-unit-report.xml -v --runslow $(circleci tests glob tests/blockchain/eth/contracts/unit/test_*.py | circleci tests split --split-by=timings)
       - store_test_results:
-          path: ~/nucypher-depends/timing-results/
-
+          path: ./reports/pytest/
 
   crypto_unit:
-    working_directory: ~/nucypher-depends
-    docker:
-      - image: circleci/python:3.6
+    <<: *python_36_base
     steps:
       - checkout
       - restore_cache:
-          key: deps-{{ .Branch }}-{{ checksum "Pipfile" }}
+          key: v4-deps-{{ .Environment.CIRCLE_WORKFLOW_ID }}-{{ checksum "Pipfile" }}
       - run:
           name: Crypto Character Tests
-          command: |
-            pipenv run pytest --cov=nucypher -v --runslow tests/crypto
+          command: pipenv run pytest --cov=nucypher/crypto -v --runslow tests/crypto --junitxml=./reports/pytest/results.xml
+      - store_test_results:
+          path: ./reports/pytest/
 
   network_unit:
-    working_directory: ~/nucypher-depends
-    docker:
-      - image: circleci/python:3.6
+    <<: *python_36_base
     steps:
       - checkout
       - restore_cache:
-          key: deps-{{ .Branch }}-{{ checksum "Pipfile" }}
+          key: v4-deps-{{ .Environment.CIRCLE_WORKFLOW_ID }}-{{ checksum "Pipfile" }}
       - run:
           name: Network Tests
-          command: |
-            pipenv run pytest --cov=nucypher -v --runslow tests/network
+          command: pipenv run pytest --cov=nucypher/network -v --runslow tests/network --junitxml=./reports/pytest/results.xml
+      - store_test_results:
+          path: ./reports/pytest/
 
   keystore_unit:
-    working_directory: ~/nucypher-depends
-    docker:
-      - image: circleci/python:3.6
+    <<: *python_36_base
     steps:
       - checkout
       - restore_cache:
-          key: deps-{{ .Branch }}-{{ checksum "Pipfile" }}
+          key: v4-deps-{{ .Environment.CIRCLE_WORKFLOW_ID }}-{{ checksum "Pipfile" }}
       - run:
           name: Keystore Tests
-          command: |
-            pipenv run pytest --cov=nucypher -v --runslow tests/keystore
+          command: pipenv run pytest --cov=nucypher/keystore -v --runslow tests/keystore --junitxml=./reports/pytest/results.xml
+      - store_test_results:
+          path: ./reports/pytest/
 
   character:
-    working_directory: ~/nucypher-depends
-    docker:
-      - image: circleci/python:3.6
+    <<: *python_36_base
     steps:
       - checkout
       - restore_cache:
-          key: deps-{{ .Branch }}-{{ checksum "Pipfile" }}
+          key: v4-deps-{{ .Environment.CIRCLE_WORKFLOW_ID }}-{{ checksum "Pipfile" }}
       - run:
           name: Character Tests
-          command: |
-            pipenv run pytest --cov=nucypher -v --runslow tests/characters
+          command: pipenv run pytest --cov=nucypher -v --runslow tests/characters --junitxml=./reports/pytest/results.xml
+      - store_test_results:
+          path: ./reports/pytest/
 
-  blockchain_client_unit:
-    working_directory: ~/nucypher-depends
-    docker:
-      - image: circleci/python:3.6
+  intercontract_integration:
+    <<: *python_36_base
     steps:
       - checkout
       - restore_cache:
-          key: deps-{{ .Branch }}-{{ checksum "Pipfile" }}
+          key: v4-deps-{{ .Environment.CIRCLE_WORKFLOW_ID }}-{{ checksum "Pipfile" }}
       - run:
-          name: Blockchain Client Tests
+          name: Ethereum Inter-Contract Integration Test
           command: |
-            pipenv run pytest --cov=nucypher -v --runslow tests/blockchain/eth/client
+            pipenv run pytest -v --runslow tests/blockchain/eth/contracts/integration --junitxml=./reports/pytest/results.xml
+      - store_test_results:
+          path: ./reports/pytest/
+#
+#  mypy_type_check:
+#    <<: *python_36_base
+#    steps:
+#      - checkout
+#      - restore_cache:
+#          key: v3-deps-{{ .Environment.CIRCLE_WORKFLOW_ID }}-{{ checksum "Pipfile" }}
+#      - run:
+#          name: Run Mypy Static Type Checks
+#          command: |
+#              mkdir ./mypy_reports ./mypy_results
+#              export MYPYPATH=./nucypher
+#              pipenv run mypy ./nucypher --config-file=mypy.ini --xslt-html-report ./mypy_reports/html/ --linecount-report ./mypy_reports/linecount --junit-xml ./mypy_results/results.xml
+#      - store_artifacts:
+#          path: ./mypy_reports
+#      - store_test_results:
+#          path: ./mypy_results

.coveragerc

@@ -0,0 +1,4 @@
+[run]
+omit =
+    setup.py,
+    *__init__.py

Pipfile

@@ -3,42 +3,42 @@ url = "https://pypi.python.org/simple"
 verify_ssl = true
 name = "pypi"
 
-
 [packages]
-# Wheels for cryptography until the next release.
-cryptography35_linux = { file='./wheelhouse/cryptography-2.3.dev1-cp35-cp35m-linux_x86_64.whl', markers="python_version >= '3.5' and python_version < '3.6' and platform_system == 'Linux'"}
-cryptography36_linux = { file='./wheelhouse/cryptography-2.3.dev1-cp36-cp36m-linux_x86_64.whl', markers="python_version >= '3.6' and python_version < '3.7' and platform_system == 'Linux'"}
-cryptography36_darwin = { file='./wheelhouse/cryptography-2.3.dev1-cp36-cp36m-macosx_10_13_x86_64.whl', markers="python_version >= '3.6' and python_version < '3.7' and platform_system == 'Darwin'"}
 
+# Wheels for cryptography until the next release
+cryptography35_linux = { path='./wheelhouse/cryptography-2.3.dev1-cp35-cp35m-linux_x86_64.whl', markers="python_version >= '3.5' and python_version < '3.6' and platform_system == 'Linux'"}
+cryptography36_linux = { path='./wheelhouse/cryptography-2.3.dev1-cp36-cp36m-linux_x86_64.whl', markers="python_version >= '3.6' and python_version < '3.7' and platform_system == 'Linux'"}
+cryptography36_darwin = { path='./wheelhouse/cryptography-2.3.dev1-cp36-cp36m-macosx_10_13_x86_64.whl', markers="python_version >= '3.6' and python_version < '3.7' and platform_system == 'Darwin'"}
 
-rpcudp = {git = "https://github.com/nucypher/rpcudp", ref = "nucypher-depend"}
-kademlia = {git = "https://github.com/nucypher/kademlia", ref = "nucypher-depend"}
-PyNaCl = "*"
-"pysha3" = "*"
-bidict = "*"
-py_ecc = "*"
-SQLAlchemy = "*"
-apistar = "*"
-maya = "*"
-pyumbral = {git = "https://github.com/nucypher/pyumbral.git", ref = "nucypher-depend"}
 requests = "*"
+maya = "*"
 hendrix = "==3.0.0"
 constantSorrow = {git = "https://github.com/nucypher/constantSorrow.git", ref = "nucypher-depend"}
 bytestringSplitter = {git = "https://github.com/nucypher/byteStringSplitter.git", ref = "nucypher-depend"}
-appdirs = "*"
-web3 = "==4.3.0"
+sqlalchemy = "*"
+apistar = "*"
+rpcudp = {git = "https://github.com/nucypher/rpcudp", ref = "nucypher-depend"}
+kademlia = {git = "https://github.com/nucypher/kademlia", ref = "nucypher-depend"}
+pynacl = "*"
+pysha3 = "*"
+py_ecc = "*"
+pyumbral = {git = "https://github.com/nucypher/pyumbral.git", ref = "nucypher-depend"}
+web3 = "==4.4.1"
 
 [dev-packages]
 pytest = "*"
 mypy = "*"
 pytest-mypy = "*"
+pytest-twisted = "*"
 codecov = "*"
 coverage = "*"
 pytest-cov = "*"
 py-solc = "*"
 py-evm = "==0.2.0a18"
-eth-tester = "==0.1.0b26"
-py-geth = "*"
+eth-tester = "==0.1.0b28"
 
 [pipenv]
 allow_prereleases = true
+
+[scripts]
+install_solc = "scripts/install_solc.sh"

examples/alicebob-grant-and-line-by-line-PRE.py → examples/finnegans-wake-federated.py

@@ -6,22 +6,27 @@
 import datetime
 import sys
 
-from examples.sandbox_resources import SandboxNetworkyStuff
+from sandbox_resources import SandboxRestMiddleware
 from nucypher.characters import Alice, Bob, Ursula
 from nucypher.data_sources import DataSource
-from nucypher.network.node import NetworkyStuff
 import maya
 
 # This is already running in another process.
-URSULA = Ursula.from_rest_url(NetworkyStuff(), address="localhost", port=3601)
-network_middleware = SandboxNetworkyStuff([URSULA])
+from nucypher.network.middleware import RestMiddleware
+from umbral.keys import UmbralPublicKey
+
+URSULA = Ursula.from_rest_url(network_middleware=RestMiddleware(),
+                              host="localhost",
+                              port=3601)
+
+network_middleware = SandboxRestMiddleware([URSULA])
 
 
 #########
 # Alice #
 #########
 
-ALICE = Alice(network_middleware=network_middleware)
+ALICE = Alice(network_middleware=network_middleware, federated_only=True)  # TODO: 289
 
 # Here are our Policy details.
 policy_end_datetime = maya.now() + datetime.timedelta(days=5)
@@ -40,7 +45,7 @@
                      expiration=policy_end_datetime)
 
 # Alice puts her public key somewhere for Bob to find later...
-alices_pubkey_saved_for_posterity = bytes(ALICE.stamp)
+alices_pubkey_bytes_saved_for_posterity = bytes(ALICE.stamp)
 
 # ...and then disappears from the internet.
 del ALICE
@@ -57,7 +62,7 @@
 # data shared on it.
 # He needs a few piece of knowledge to do that.
 BOB.join_policy(label,  # The label - he needs to know what data he's after.
-                alices_pubkey_saved_for_posterity,  # To verify the signature, he'll need Alice's public key.
+                alices_pubkey_bytes_saved_for_posterity,  # To verify the signature, he'll need Alice's public key.
                 verify_sig=True,  # And yes, he usually wants to verify that signature.
                 # He can also bootstrap himself onto the network more quickly
                 # by providing a list of known nodes at this time.
@@ -133,9 +138,10 @@
 
     # Now Bob can retrieve the original message.  He just needs the MessageKit
     # and the DataSource which produced it.
+    alice_pubkey_restored_from_ancient_scroll = UmbralPublicKey.from_bytes(alices_pubkey_bytes_saved_for_posterity)
     delivered_cleartext = BOB.retrieve(message_kit=message_kit,
                                        data_source=datasource_as_understood_by_bob,
-                                       alice_pubkey_sig=alices_pubkey_saved_for_posterity)
+                                       alice_pubkey_sig=alice_pubkey_restored_from_ancient_scroll)
 
     # We show that indeed this is the passage originally encrypted by the DataSource.
     assert plaintext == delivered_cleartext

examples/run_ursula_with_rest_and_dht_but_no_mining.py

@@ -19,7 +19,7 @@
 
 DB_NAME = "non-mining-proxy-node"
 
-_URSULA = Ursula(dht_port=3501, rest_port=3601, ip_address="localhost", db_name=DB_NAME)
+_URSULA = Ursula(dht_port=3501, rest_port=3601, ip_address="localhost", db_name=DB_NAME, federated_only=True)
 _URSULA.dht_listen()
 
 CURVE = ec.SECP256R1