Merge remote-tracking branch 'wot/main'

WebOfTrust · Dec 3, 2024 · 4028b58 · 4028b58
2 parents 6862dd6 + 7737bfd
commit 4028b58
Show file tree

Hide file tree

Showing 48 changed files with 786 additions and 311 deletions.
diff --git a/README.md b/README.md
@@ -38,6 +38,15 @@ python 3.12.1+
 libsodium 1.0.18+
 
 
+##### Libsodium installation
+
+After installing with Homebrew you need to link the library to the default location that the `ctypes.find_library()` looks in, `/usr/local/lib`, as shown below:
+
+```shell
+sudo ln -s /opt/homebrew/lib /usr/local/lib
+```
+
+
 #### python packages
 lmdb 0.98+
 pysodium 0.7.5+

diff --git a/docs/Makefile b/docs/Makefile
@@ -12,9 +12,21 @@ BUILDDIR      = _build
 help:
 	@$(SPHINXBUILD) -M help "$(SOURCEDIR)" "$(BUILDDIR)" $(SPHINXOPTS) $(O)
 
-.PHONY: help Makefile
+.PHONY: help Makefile clean html
 
 # Catch-all target: route all unknown targets to Sphinx using the new
 # "make mode" option.  $(O) is meant as a shortcut for $(SPHINXOPTS).
 %: Makefile
 	@$(SPHINXBUILD) -M $@ "$(SOURCEDIR)" "$(BUILDDIR)" $(SPHINXOPTS) $(O)
+
+clean:
+	rm -rf $(BUILDDIR)/*
+
+html:
+	$(SPHINXBUILD) -b html $(ALLSPHINXOPTS) $(SOURCEDIR) $(BUILDDIR)/html
+	@echo
+	@echo "Build finished. The HTML pages are in $(BUILDDIR)/html."
+	@echo
+
+open:
+	open _build/html/index.html
diff --git a/docs/_static/.gitkeep b/docs/_static/.gitkeep
diff --git a/docs/conf.py b/docs/conf.py
@@ -28,7 +28,7 @@
     sphinx_rtd_theme = None
 
 project = 'keri'
-copyright = '2022, Dr. Samuel Smith and contributors'
+copyright = '2022 - 2024, Dr. Samuel Smith and contributors'
 author = 'Dr. Samuel Smith'
 
 version = release = keri.__version__
@@ -62,7 +62,6 @@
 #
 if sphinx_rtd_theme:
     html_theme = "sphinx_rtd_theme"
-    html_theme_path = [sphinx_rtd_theme.get_html_theme_path()]
 else:
     html_theme = "default"
 

diff --git a/docs/index.rst b/docs/index.rst
@@ -1,6 +1,6 @@
-==================================================
-Python Implementation of the KERI Core Libraries
-==================================================
+==========================================================
+Python Reference Implementation of the KERI Core Libraries
+==========================================================
 
 .. image:: https://img.shields.io/pypi/v/keri.svg
     :target: https://pypi.org/project/keri/
@@ -32,6 +32,7 @@ API Reference
 .. toctree::
     :maxdepth: 1
 
+    naming
     keri_app
     keri_core
     keri_db

diff --git a/docs/keri_app.rst b/docs/keri_app.rst
@@ -13,12 +13,6 @@ keri.app.apping
 .. automodule:: keri.app.apping
     :members:
 
-keri.app.booting
-----------------
-
-.. automodule:: keri.app.booting
-    :members:
-
 keri.app.challenging
 --------------------
 
@@ -32,7 +26,7 @@ keri.app.configing
     :members:
 
 keri.app.connecting
-------------------
+-------------------
 
 .. automodule:: keri.app.connecting
     :members:
@@ -85,12 +79,6 @@ keri.app.keeping
 .. automodule:: keri.app.keeping
     :members:
 
-keri.app.kiwiing
-----------------
-
-.. automodule:: keri.app.kiwiing
-    :members:
-
 keri.app.notifying
 ------------------
 
@@ -100,7 +88,7 @@ keri.app.notifying
 keri.app.oobing
 ---------------
 
-.. automodule:: keri.app.oobing
+.. automodule:: keri.app.oobiing
     :members:
 
 keri.app.signaling

diff --git a/docs/keri_core.rst b/docs/keri_core.rst
@@ -7,12 +7,24 @@ keri.core.coring
 .. automodule:: keri.core.coring
     :members:
 
+keri.core.counting
+------------------
+
+.. automodule:: keri.core.counting
+    :members:
+
 keri.core.eventing
 ------------------
 
 .. automodule:: keri.core.eventing
     :members:
 
+ker.core.indexing
+-----------------
+
+.. automodule:: keri.core.indexing
+    :members:
+
 keri.core.parsing
 -----------------
 
@@ -31,3 +43,21 @@ keri.core.scheming
 .. automodule:: keri.core.scheming
     :members:
 
+keri.core.signing
+-----------------
+
+.. automodule:: keri.core.signing
+    :members:
+
+keri.core.streaming
+-------------------
+
+.. automodule:: keri.core.streaming
+    :members:
+
+keri.core.structing
+-------------------
+
+.. automodule:: keri.core.structing
+    :members:
+
diff --git a/docs/keri_db.rst b/docs/keri_db.rst
@@ -25,6 +25,12 @@ keri.db.koming
 .. automodule:: keri.db.koming
     :members:
 
+keri.db.migrations
+------------------
+
+.. automodule:: keri.db.migrations
+    :members:
+
 keri.db.subing
 --------------
 

diff --git a/docs/keri_demo.rst b/docs/keri_demo.rst
@@ -0,0 +1,8 @@
+KERI Demo API
+=============
+
+keri.demo.demoing
+-----------------
+
+.. automodule:: keri.demo.demoing
+    :members:
diff --git a/docs/keri_help.rst b/docs/keri_help.rst
@@ -1,5 +1,5 @@
 KERI Help API
-============
+=============
 
 keri.help.helping
 -----------------

diff --git a/docs/keri_peer.rst b/docs/keri_peer.rst
@@ -1,5 +1,5 @@
 KERI Peer API
-============
+=============
 
 keri.peer.exchanging
 --------------------

diff --git a/docs/keri_vc.rst b/docs/keri_vc.rst
@@ -1,8 +1,8 @@
 KERI Verificable Credential API
-=============
+===============================
 
 keri.vc.protocoling
-----------------
+-------------------
 
 .. automodule:: keri.vc.protocoling
     :members:

diff --git a/docs/naming.md b/docs/naming.md
@@ -1,5 +1,5 @@
-
-# Python Style Guide for keripy
+# Naming and Style guide
+## Python Style Guide for KERIpy
 
 The Python PEPs on style have many options or allowed variants.
 The purpose of this document is to select a single preferred style

diff --git a/docs/requirements.txt b/docs/requirements.txt
@@ -1,2 +1,11 @@
-myst-parser >= 0.16.1
-Sphinx >= 4.3.2
+myst-parser >= 4.0.0
+Sphinx >= 8.1.3
+
+sphinx-rtd-theme==3.0.1
+sphinxcontrib-applehelp==2.0.0
+sphinxcontrib-devhelp==2.0.0
+sphinxcontrib-htmlhelp==2.1.0
+sphinxcontrib-jquery==4.1
+sphinxcontrib-jsmath==1.0.1
+sphinxcontrib-qthelp==2.0.0
+sphinxcontrib-serializinghtml==2.0.0
diff --git a/scripts/demo/basic/challenge.sh b/scripts/demo/basic/challenge.sh
@@ -14,6 +14,12 @@ cha2_oobi="$(kli oobi generate --name cha2 --alias cha2 --role witness | sed -n
 kli oobi resolve --name cha1 --oobi-alias cha2 --oobi "${cha2_oobi}"
 kli oobi resolve --name cha2 --oobi-alias cha1 --oobi "${cha1_oobi}"
 
+cha1_pre="$(kli aid --name cha1 --alias cha1)"
+cha2_pre="$(kli aid --name cha2 --alias cha2)"
+
+kli contacts replace --name cha1 --prefix "${cha2_pre}" --alias cha2
+kli contacts replace --name cha2 --prefix "${cha1_pre}" --alias cha1
+
 words1="$(kli challenge generate --out string)"
 words2="$(kli challenge generate --out string)"
 

diff --git a/scripts/demo/basic/demo-script.sh b/scripts/demo/basic/demo-script.sh
@@ -46,16 +46,16 @@ isSuccess
 kli sign --name test --base "${KERI_TEMP_DIR}"  --alias trans --text @${KERI_DEMO_SCRIPT_DIR}/data/anchor.json
 isSuccess
 
-kli verify --name test --base "${KERI_TEMP_DIR}"  --alias trans --prefix EIryzWYlZ9bQr7EhMAoBXk4r2h-OgaEqERid7-AHNp6o --text @${KERI_DEMO_SCRIPT_DIR}/data/anchor.json --signature AABuQervAG8QLyvho99362U8TScec_4zYDVF1pUMWfWfKbl5thR6QakpvSvVMdcPcGYxi0McgNtW-Z3EhpC01I4A
+kli verify --name test --base "${KERI_TEMP_DIR}" --prefix EIryzWYlZ9bQr7EhMAoBXk4r2h-OgaEqERid7-AHNp6o --text @${KERI_DEMO_SCRIPT_DIR}/data/anchor.json --signature AABuQervAG8QLyvho99362U8TScec_4zYDVF1pUMWfWfKbl5thR6QakpvSvVMdcPcGYxi0McgNtW-Z3EhpC01I4A
 isSuccess
 
-kli verify --name test --base "${KERI_TEMP_DIR}"  --alias trans --prefix EIryzWYlZ9bQr7EhMAoBXk4r2h-OgaEqERid7-AHNp6o --text @${KERI_DEMO_SCRIPT_DIR}/data/anchor.json --signature ABBJcS2ZbcHEdEEnaJE1CFUxdsKqkoU5TS34CImGh3s0cs-k3cNcy2PJxQ8WjIvAot1-cZ71o1E-WkqZ-tCTNZsJ
+kli verify --name test --base "${KERI_TEMP_DIR}" --prefix EIryzWYlZ9bQr7EhMAoBXk4r2h-OgaEqERid7-AHNp6o --text @${KERI_DEMO_SCRIPT_DIR}/data/anchor.json --signature ABBJcS2ZbcHEdEEnaJE1CFUxdsKqkoU5TS34CImGh3s0cs-k3cNcy2PJxQ8WjIvAot1-cZ71o1E-WkqZ-tCTNZsJ
 isSuccess
 
-kli verify --name test --base "${KERI_TEMP_DIR}"  --alias trans --prefix EIryzWYlZ9bQr7EhMAoBXk4r2h-OgaEqERid7-AHNp6o --text @${KERI_DEMO_SCRIPT_DIR}/data/anchor.json --signature ACBieMVQBXvIxeqQuHc4Db_-GUoFE9e37TW8t6DomwXdMcSxBiHJpDp3EJH1Dcz9lHKbFuCRqoNo4wywZGtUpOcB
+kli verify --name test --base "${KERI_TEMP_DIR}" --prefix EIryzWYlZ9bQr7EhMAoBXk4r2h-OgaEqERid7-AHNp6o --text @${KERI_DEMO_SCRIPT_DIR}/data/anchor.json --signature ACBieMVQBXvIxeqQuHc4Db_-GUoFE9e37TW8t6DomwXdMcSxBiHJpDp3EJH1Dcz9lHKbFuCRqoNo4wywZGtUpOcB
 isSuccess
 
-kli verify --name test --base "${KERI_TEMP_DIR}"  --alias trans --prefix EIryzWYlZ9bQr7EhMAoBXk4r2h-OgaEqERid7-AHNp6o --text @${KERI_DEMO_SCRIPT_DIR}/data/anchor.json --signature ACSHdal6kHAAjbW_frH83sDDCoBHw_nNKFysW5Dj8PSsnwVPePCNw-kFmF6Z8H87q7D3abw_5u2i4jmzdnWFsRDz
+kli verify --name test --base "${KERI_TEMP_DIR}" --prefix EIryzWYlZ9bQr7EhMAoBXk4r2h-OgaEqERid7-AHNp6o --text @${KERI_DEMO_SCRIPT_DIR}/data/anchor.json --signature ACSHdal6kHAAjbW_frH83sDDCoBHw_nNKFysW5Dj8PSsnwVPePCNw-kFmF6Z8H87q7D3abw_5u2i4jmzdnWFsRDz
 ret=$?
 if [ $ret -eq 0 ]; then
    echo "Testing invalid signature should fail $ret"

diff --git a/scripts/demo/credentials/multisig-grant-multisig-admit.sh b/scripts/demo/credentials/multisig-grant-multisig-admit.sh
@@ -28,7 +28,9 @@ kli incept --name issuer2 --alias issuer2 --file ${KERI_DEMO_SCRIPT_DIR}/data/is
 
 # Exchange OOBIs between issuer group
 kli oobi resolve --name issuer1 --oobi-alias issuer2 --oobi http://127.0.0.1:5642/oobi/EFJtDtSoE6XOOqLoLvYoB7ctCzMtJDiAJltnXiK_EdlM/witness
+kli contacts replace --name issuer1 --prefix EFJtDtSoE6XOOqLoLvYoB7ctCzMtJDiAJltnXiK_EdlM --alias issuer2
 kli oobi resolve --name issuer2 --oobi-alias issuer1 --oobi http://127.0.0.1:5642/oobi/EEVlFHcMWAQNwezHjyKK5cKKzF6zgLlnrLyi_CcAEXCs/witness
+kli contacts replace --name issuer2 --prefix EEVlFHcMWAQNwezHjyKK5cKKzF6zgLlnrLyi_CcAEXCs --alias issuer1
 
 # Create the identifier to which the credential will be issued
 kli init --name issuee1 --salt 0ACDEyMzQ1Njc4OWxtbm9qWc --nopasscode --config-dir ${KERI_SCRIPT_DIR} --config-file demo-witness-oobis
@@ -40,19 +42,29 @@ kli incept --name issuee2 --alias issuee2 --file ${KERI_DEMO_SCRIPT_DIR}/data/is
 
 # Exchange OOBIs between issuee group
 kli oobi resolve --name issuee1 --oobi-alias issuee2 --oobi http://127.0.0.1:5642/oobi/EPw5WQAFcNXXSbg_pTKgh8-K_rfXnD1uDKS13OeNHkKE/witness
+kli contacts replace --name issuee1 --prefix EPw5WQAFcNXXSbg_pTKgh8-K_rfXnD1uDKS13OeNHkKE --alias issuee2
 kli oobi resolve --name issuee2 --oobi-alias issuee1 --oobi http://127.0.0.1:5642/oobi/EI0IoYyHxXc7_uQyaN2WocSC3lRZsvrDAPbREOw7fM0_/witness
+kli contacts replace --name issuee2 --prefix EI0IoYyHxXc7_uQyaN2WocSC3lRZsvrDAPbREOw7fM0_ --alias issuee1
 
 # Introduce issuer to issuee
 kli oobi resolve --name issuee1 --oobi-alias issuer1 --oobi http://127.0.0.1:5642/oobi/EEVlFHcMWAQNwezHjyKK5cKKzF6zgLlnrLyi_CcAEXCs/witness
+kli contacts replace --name issuee1 --prefix EEVlFHcMWAQNwezHjyKK5cKKzF6zgLlnrLyi_CcAEXCs --alias issuer1
 kli oobi resolve --name issuee2 --oobi-alias issuer1 --oobi http://127.0.0.1:5642/oobi/EEVlFHcMWAQNwezHjyKK5cKKzF6zgLlnrLyi_CcAEXCs/witness
+kli contacts replace --name issuee2 --prefix EEVlFHcMWAQNwezHjyKK5cKKzF6zgLlnrLyi_CcAEXCs --alias issuer1
 kli oobi resolve --name issuee1 --oobi-alias issuer2 --oobi http://127.0.0.1:5642/oobi/EFJtDtSoE6XOOqLoLvYoB7ctCzMtJDiAJltnXiK_EdlM/witness
+kli contacts replace --name issuee1 --prefix EFJtDtSoE6XOOqLoLvYoB7ctCzMtJDiAJltnXiK_EdlM --alias issuer2
 kli oobi resolve --name issuee2 --oobi-alias issuer2 --oobi http://127.0.0.1:5642/oobi/EFJtDtSoE6XOOqLoLvYoB7ctCzMtJDiAJltnXiK_EdlM/witness
+kli contacts replace --name issuee2 --prefix EFJtDtSoE6XOOqLoLvYoB7ctCzMtJDiAJltnXiK_EdlM --alias issuer2
 
 # Introduce the issuee to issuer
 kli oobi resolve --name issuer1 --oobi-alias issuee1 --oobi http://127.0.0.1:5642/oobi/EI0IoYyHxXc7_uQyaN2WocSC3lRZsvrDAPbREOw7fM0_/witness
+kli contacts replace --name issuer1 --prefix EI0IoYyHxXc7_uQyaN2WocSC3lRZsvrDAPbREOw7fM0_ --alias issuee1
 kli oobi resolve --name issuer2 --oobi-alias issuee1 --oobi http://127.0.0.1:5642/oobi/EI0IoYyHxXc7_uQyaN2WocSC3lRZsvrDAPbREOw7fM0_/witness
+kli contacts replace --name issuer2 --prefix EI0IoYyHxXc7_uQyaN2WocSC3lRZsvrDAPbREOw7fM0_ --alias issuee1
 kli oobi resolve --name issuer1 --oobi-alias issuee2 --oobi http://127.0.0.1:5642/oobi/EPw5WQAFcNXXSbg_pTKgh8-K_rfXnD1uDKS13OeNHkKE/witness
+kli contacts replace --name issuer1 --prefix EPw5WQAFcNXXSbg_pTKgh8-K_rfXnD1uDKS13OeNHkKE --alias issuee2
 kli oobi resolve --name issuer2 --oobi-alias issuee2 --oobi http://127.0.0.1:5642/oobi/EPw5WQAFcNXXSbg_pTKgh8-K_rfXnD1uDKS13OeNHkKE/witness
+kli contacts replace --name issuer2 --prefix EPw5WQAFcNXXSbg_pTKgh8-K_rfXnD1uDKS13OeNHkKE --alias issuee2
 
 ## Load Data OOBI for schema of credential to issue
 kli oobi resolve --name issuer1 --oobi-alias vc --oobi http://127.0.0.1:7723/oobi/EBfdlu8R27Fbx-ehrqwImnK-8Cm79sqbAQ4MmvEAYqao
@@ -84,10 +96,14 @@ wait $PID_LIST
 
 # Introduce issuer issuer issuer to issuees
 kli oobi resolve --name issuer1 --oobi-alias issuee --oobi http://127.0.0.1:5642/oobi/ELkmm28zQEyxkryJZQ4WVT4fjukklM4dR91l2DQfQHZK/witness
+kli contacts replace --name issuer1 --prefix ELkmm28zQEyxkryJZQ4WVT4fjukklM4dR91l2DQfQHZK --alias issuee
 kli oobi resolve --name issuer2 --oobi-alias issuee --oobi http://127.0.0.1:5642/oobi/ELkmm28zQEyxkryJZQ4WVT4fjukklM4dR91l2DQfQHZK/witness
+kli contacts replace --name issuer2 --prefix ELkmm28zQEyxkryJZQ4WVT4fjukklM4dR91l2DQfQHZK --alias issuee
 
 kli oobi resolve --name issuee1 --oobi-alias issuer --oobi http://127.0.0.1:5642/oobi/ELrnb8aI_wy2q_sSbCAwkgy2kOdMpRI1urFrhQiMJGLW/witness
+kli contacts replace --name issuee1 --prefix ELrnb8aI_wy2q_sSbCAwkgy2kOdMpRI1urFrhQiMJGLW --alias issuer
 kli oobi resolve --name issuee2 --oobi-alias issuer --oobi http://127.0.0.1:5642/oobi/ELrnb8aI_wy2q_sSbCAwkgy2kOdMpRI1urFrhQiMJGLW/witness
+kli contacts replace --name issuee2 --prefix ELrnb8aI_wy2q_sSbCAwkgy2kOdMpRI1urFrhQiMJGLW --alias issuer
 
 # Create a credential registry owned by the issuer issuer
 kli vc registry incept --name issuer1 --alias issuer --registry-name vLEI --usage "Issue vLEIs" --nonce AHSNDV3ABI6U8OIgKaj3aky91ZpNL54I5_7-qwtC6q2s &

diff --git a/scripts/demo/credentials/multisig-issuer-interactive.sh b/scripts/demo/credentials/multisig-issuer-interactive.sh
@@ -15,19 +15,25 @@ kli incept --name multisig2 --alias multisig2 --file ${KERI_DEMO_SCRIPT_DIR}/dat
 
 # Exchange OOBIs between multisig group
 kli oobi resolve --name multisig1 --oobi-alias multisig2 --oobi http://127.0.0.1:5642/oobi/EJccSRTfXYF6wrUVuenAIHzwcx3hJugeiJsEKmndi5q1/witness
+kli contacts replace --name multisig1 --prefix EJccSRTfXYF6wrUVuenAIHzwcx3hJugeiJsEKmndi5q1 --alias multisig2
 kli oobi resolve --name multisig2 --oobi-alias multisig1 --oobi http://127.0.0.1:5642/oobi/EKYLUMmNPZeEs77Zvclf0bSN5IN-mLfLpx2ySb-HDlk4/witness
+kli contacts replace --name multisig2 --prefix EKYLUMmNPZeEs77Zvclf0bSN5IN-mLfLpx2ySb-HDlk4 --alias multisig1
 
 # Create the identifier to which the credential will be issued
 kli init --name holder --salt 0ACDEyMzQ1Njc4OWxtbm9qWc --nopasscode --config-dir ${KERI_SCRIPT_DIR} --config-file demo-witness-oobis
 kli incept --name holder --alias holder --file ${KERI_DEMO_SCRIPT_DIR}/data/gleif-sample.json
 
 # Introduce multisig to Holder
 kli oobi resolve --name holder --oobi-alias multisig2 --oobi http://127.0.0.1:5642/oobi/EJccSRTfXYF6wrUVuenAIHzwcx3hJugeiJsEKmndi5q1/witness
+kli contacts replace --name holder --prefix EJccSRTfXYF6wrUVuenAIHzwcx3hJugeiJsEKmndi5q1 --alias multisig2
 kli oobi resolve --name holder --oobi-alias multisig1 --oobi http://127.0.0.1:5642/oobi/EKYLUMmNPZeEs77Zvclf0bSN5IN-mLfLpx2ySb-HDlk4/witness
+kli contacts replace --name holder --prefix EKYLUMmNPZeEs77Zvclf0bSN5IN-mLfLpx2ySb-HDlk4 --alias multisig1
 
 # Introduce the holder to all participants in the multisig group
 kli oobi resolve --name multisig1 --oobi-alias holder --oobi http://127.0.0.1:5642/oobi/ELjSFdrTdCebJlmvbFNX9-TLhR2PO0_60al1kQp5_e6k/witness
+kli contacts replace --name multisig1 --prefix ELjSFdrTdCebJlmvbFNX9-TLhR2PO0_60al1kQp5_e6k --alias holder
 kli oobi resolve --name multisig2 --oobi-alias holder --oobi http://127.0.0.1:5642/oobi/ELjSFdrTdCebJlmvbFNX9-TLhR2PO0_60al1kQp5_e6k/witness
+kli contacts replace --name multisig2 --prefix ELjSFdrTdCebJlmvbFNX9-TLhR2PO0_60al1kQp5_e6k --alias holder
 
 # Load Data OOBI for schema of credential to issue
 kli oobi resolve --name multisig1 --oobi-alias vc --oobi http://127.0.0.1:7723/oobi/EBfdlu8R27Fbx-ehrqwImnK-8Cm79sqbAQ4MmvEAYqao
@@ -48,6 +54,7 @@ kli multisig join --name multisig2
 
 wait $PID_LIST
 kli oobi resolve --name holder --oobi-alias multisig --oobi http://127.0.0.1:5642/oobi/EC61gZ9lCKmHAS7U5ehUfEbGId5rcY0D7MirFZHDQcE2/witness
+kli contacts replace --name holder --prefix EC61gZ9lCKmHAS7U5ehUfEbGId5rcY0D7MirFZHDQcE2 --alias multisig
 
 # Create a credential registry owned by the multisig issuer
 kli vc registry incept --name multisig1 --alias multisig --registry-name vLEI --usage "Issue vLEIs" --nonce AHSNDV3ABI6U8OIgKaj3aky91ZpNL54I5_7-qwtC6q2s &

diff --git a/src/keri/app/cli/commands/clean.py b/src/keri/app/cli/commands/clean.py
@@ -47,9 +47,13 @@ def __init__(self, args):
         super(CleanDoer, self).__init__()
 
     def recur(self, tyme):
-
         hby = existing.setupHby(name=self.args.name, base=self.args.base,
                                 bran=self.args.bran, temp=self.args.temp)
+
+        print("Clearing escrows...")
+        hby.db.clearEscrows()
+        print("Finished")
+
         print("Migrating...")
         hby.db.migrate()
         print("Finished")
@@ -59,6 +63,6 @@ def recur(self, tyme):
 
         print("Database open, performing clean...")
         hby.db.clean()
-        print("Finished.")
+        print("Finished")
 
         return True