Merge branch 'main' into docker_fixes

.github/workflows/publish-verifier.yml

@@ -24,7 +24,7 @@ jobs:
         id: meta
         uses: docker/metadata-action@v4
         with:
-          images: GLEIF-it/reg-poc-verifier
+          images: GLEIF-it/vlei-verifier
 
 #      - name: Build and push Docker image
 #        uses: docker/build-push-action@v3

.github/workflows/python-app-ci.yml

@@ -2,12 +2,11 @@
 # For more information see: https://help.github.com/actions/language-and-framework-guides/using-python-with-github-actions
 
 
-name: GitHub Actions for reg-poc-verifier
+name: GitHub Actions for vlei-verifier
 on:
   push:
     branches:
       - 'main'
-      - 'dev'
   pull_request:
   workflow_dispatch:
 
@@ -17,26 +16,34 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        os: [ macos-latest, ubuntu-latest ]
+        os: [ macos-13, ubuntu-latest ]
 
     steps:
       - uses: actions/checkout@v3
       - name: Set up Python 3.12.2
         uses: actions/setup-python@v2
         with:
           python-version: 3.12.2
+      - name: Install libsodium
+        run: |
+          if [ "${{ runner.os }}" == "macOS" ]; then
+            brew install libsodium
+          else
+            sudo apt-get install -y libsodium-dev
+          fi
       - name: Install dependencies
         run: |
           python -m pip install --upgrade pip
           pip install flake8 pytest hio
+          export SODIUM_INSTALL=bundled
           if [ -f requirements.txt ]; then pip install -r requirements.txt; fi
       - name: Lint changes
         run: |
           # stop the build if there are Python syntax errors or undefined names
           flake8 . --count --select=E9,F63,F7,F82 --show-source --statistics
           # exit-zero treats all errors as warnings. The GitHub editor is 127 chars wide
           flake8 . --count --exit-zero --ignore=E7,F841,E301,E302,E303 --max-complexity=10 --max-line-length=127 --statistics
-      - name: Run core KERI tests
+      - name: Run core tests
         run: |
           pytest tests/
 
@@ -53,7 +60,7 @@ jobs:
           python -m pip install --upgrade pip
           pip install pytest pytest-cov hio
           if [ -f requirements.txt ]; then pip install -r requirements.txt; fi
-      - name: Run core reg-poc-verifier tests
+      - name: Run core vlei-verifier tests
         run: |
           pytest --cov=./ --cov-report=xml
       - name: Upload

README.md

@@ -1,4 +1,4 @@
-# reg-poc-verifier
+# vlei-verifier
 A service to verify signatures created by AIDs using [KERI](https://keri.one).
 
 ## Architecture
@@ -24,23 +24,21 @@ verifier server start --config-dir scripts --config-file verifier-config.json
 ### Webapp
 The web app (UI front-end) uses Signify/KERIA for selecting identifiers and credentials:
 
-See: [reg-poc-webapp](https://github.com/GLEIF-IT/reg-poc-webapp)
+See: [reg-pilot-webapp](https://github.com/GLEIF-IT/reg-poc-webapp)
 
 ### Server
 Provides the ability to:
 * Log in using a vLEI ECR
 * Upload signed files
 * Check the status of an upload
 
-See: [reg-poc-server](https://github.com/GLEIF-IT/reg-poc-server)
+See: [reg-pilot-server](https://github.com/GLEIF-IT/reg-poc-server)
 
 ### Additional service
 * KERI Witness Network
 * vLEI server
 * KERI Agent
 
-The deployment architecture is demonstrated in [reg-poc](https://github.com/GLEIF-IT/reg-poc)
-
 ## Registering an AID as a Valid Report Submitter
 For an AID to be registered as a valid report submitter it must use the `/presentations/{said}` API to present a valid
 vLEI ECR credential in the body of a PUT request with a content type of `application/json+cesr`.  The `said` in the URL

setup.py

@@ -28,7 +28,6 @@
 from glob import glob
 from os.path import basename
 from os.path import splitext
-
 from setuptools import find_packages
 from setuptools import setup
 
@@ -40,7 +39,7 @@
     long_description="Verifier: Proof of Concept vLEI Verifier.",
     author='Phil Feairheller',
     author_email='Philip.Feairheller@gleif.org',
-    url='https://github.com/GLEIF-IT/reg-poc-verifier',
+    url='https://github.com/GLEIF-IT/vlei-verifier',
     packages=find_packages('src'),
     package_dir={'': 'src'},
     py_modules=[splitext(basename(path))[0] for path in glob('src/*.py')],
@@ -64,7 +63,7 @@
         'Topic :: Utilities',
     ],
     project_urls={
-        'Issue Tracker': 'https://github.com/WebOfTrust/reg-poc-verifier/issues',
+        'Issue Tracker': 'https://github.com/GLEIF-IT/vlei-verifier/issues',
     },
     keywords=[
         "secure attribution",
@@ -82,6 +81,7 @@
         'http_sfv>=0.9.8',
         'dataclasses_json>=0.5.7',
         'apispec>=6.3.0',
+        'requests>=2.31.0',
     ],
     extras_require={
         # eg:

tests/core/test_basing.py

@@ -12,7 +12,7 @@ def test_vdb():
     assert baser.name == "vdb"
     assert baser.temp is False
     assert isinstance(baser.env, lmdb.Environment)
-    assert baser.path.endswith("keri/vdb/vdb")
+    assert baser.path.endswith("/vdb/vdb")
     assert baser.env.path() == baser.path
     assert os.path.exists(baser.path)
 

tests/integration/test_service.py

@@ -61,12 +61,15 @@ def get():
         doist = doing.Doist(limit=limit, tock=tock)
         doist.doers = doers
         doist.enter()
-        assert len(doist.deeds) == 2
-        assert [val[1] for val in doist.deeds] == [0.0, 0.0]  #  retymes
+        # assert len(doist.deeds) == 2
+        # assert [val[1] for val in doist.deeds] == [0.0, 0.0]  #  retymes
         # for doer in doers:
         #     assert doer.baser.opened
         #     assert "_test/keri/db/test" in doer.baser.path
-        doist.recur()
+        try:
+            doist.recur()
+        except Exception as e:
+            raise ValueError(f"Likely you have another service running on {port}")
 
         issAndCred = bytearray()
         # issAndCred.extend(kmsgs)