keri 2.0.0.dev1__tar.gz → 2.0.0.dev5__tar.gz

{keri-2.0.0.dev1/src/keri.egg-info → keri-2.0.0.dev5}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: keri
-Version: 2.0.0.dev1
+Version: 2.0.0.dev5
 Summary: Key Event Receipt Infrastructure
 Home-page: https://github.com/WebOfTrust/keripy
 Author: Samuel M. Smith
@@ -18,28 +18,30 @@ Classifier: Operating System :: Microsoft :: Windows
 Classifier: Programming Language :: Python :: 3.13
 Classifier: Programming Language :: Python :: Implementation :: CPython
 Classifier: Topic :: Utilities
-Requires-Python: >=3.13.4
+Requires-Python: >=3.14.2
 License-File: LICENSE
-Requires-Dist: lmdb>=1.6.2
+Requires-Dist: lmdb>=1.7.5
 Requires-Dist: pysodium>=0.7.18
-Requires-Dist: blake3>=1.0.5
-Requires-Dist: msgpack>=1.1.0
-Requires-Dist: cbor2>=5.6.5
-Requires-Dist: multidict>=6.4.4
+Requires-Dist: blake3>=1.0.8
+Requires-Dist: msgpack>=1.1.2
+Requires-Dist: cbor2>=5.8.0
+Requires-Dist: multidict>=6.7.0
 Requires-Dist: ordered-set>=4.1.0
-Requires-Dist: hio>=0.7.14
-Requires-Dist: multicommand>=1.0.0
-Requires-Dist: jsonschema>=4.24.0
-Requires-Dist: falcon>=4.0.2
+Requires-Dist: hio>=0.7.18
+Requires-Dist: multicommand==1.0.0
+Requires-Dist: jsonschema>=4.26.0
+Requires-Dist: falcon>=4.2.0
 Requires-Dist: hjson>=3.1.0
-Requires-Dist: PyYaml>=6.0.2
-Requires-Dist: apispec>=6.8.2
+Requires-Dist: PyYaml>=6.0.3
+Requires-Dist: apispec>=6.9.0
 Requires-Dist: mnemonic>=0.21
-Requires-Dist: PrettyTable>=3.16.0
+Requires-Dist: PrettyTable>=3.17.0
 Requires-Dist: http_sfv>=0.9.9
-Requires-Dist: cryptography>=45.0.4
+Requires-Dist: cryptography>=46.0.3
 Requires-Dist: semver>=3.0.4
 Requires-Dist: qrcode>=8.2
+Requires-Dist: setuptools>=80.9.0
+Requires-Dist: wheel>=0.45.1
 Dynamic: author
 Dynamic: author-email
 Dynamic: classifier

{keri-2.0.0.dev1 → keri-2.0.0.dev5}/setup.py

@@ -37,7 +37,7 @@ from os.path import splitext
 from setuptools import find_packages, setup
 setup(
     name='keri',
-    version='2.0.0-dev1',  # also change in src/keri/__init__.py
+    version='2.0.0-dev5',  # also change in src/keri/__init__.py
     license='Apache Software License 2.0',
     description='Key Event Receipt Infrastructure',
     long_description="KERI Decentralized Key Management Infrastructure",
@@ -74,34 +74,36 @@ setup(
     keywords=[
         # eg: 'keyword1', 'keyword2', 'keyword3',
     ],
-    python_requires='>=3.13.4',
+    python_requires='>=3.14.2',
     install_requires=[
-                        'lmdb>=1.6.2',
+                        'lmdb>=1.7.5',
                         'pysodium>=0.7.18',
-                        'blake3>=1.0.5',
-                        'msgpack>=1.1.0',
-                        'cbor2>=5.6.5',
-                        'multidict>=6.4.4',
+                        'blake3>=1.0.8',
+                        'msgpack>=1.1.2',
+                        'cbor2>=5.8.0',
+                        'multidict>=6.7.0',
                         'ordered-set>=4.1.0',
-                        'hio>=0.7.14',
-                        'multicommand>=1.0.0',
-                        'jsonschema>=4.24.0',
-                        'falcon>=4.0.2',
+                        'hio>=0.7.18',
+                        'multicommand==1.0.0',
+                        'jsonschema>=4.26.0',
+                        'falcon>=4.2.0',
                         'hjson>=3.1.0',
-                        'PyYaml>=6.0.2',
-                        'apispec>=6.8.2',
+                        'PyYaml>=6.0.3',
+                        'apispec>=6.9.0',
                         'mnemonic>=0.21',
-                        'PrettyTable>=3.16.0',
+                        'PrettyTable>=3.17.0',
                         'http_sfv>=0.9.9',
-                        'cryptography>=45.0.4',
+                        'cryptography>=46.0.3',
                         'semver>=3.0.4',
-                        'qrcode>=8.2'
+                        'qrcode>=8.2',
+                        'setuptools>=80.9.0',
+                        'wheel>=0.45.1',
     ],
     extras_require={
     },
     tests_require=[
-                    'coverage>=7.9.0',
-                    'pytest>=8.4.0',
+                    'coverage>=7.13.1',
+                    'pytest>=9.0.2',
                     'pytest-shell>=0.3.2'
                   ],
     setup_requires=[

keri-2.0.0.dev5/src/keri/__init__.py

@@ -0,0 +1,7 @@
+# -*- encoding: utf-8 -*-
+
+__version__ = '2.0.0-dev5'  # also change in setup.py
+
+
+from .kering import (Vrsn_1_0, Vrsn_2_0, Kinds, Protocols, Colds, Ilks, sniff,
+                     TraitDex)

{keri-2.0.0.dev1 → keri-2.0.0.dev5}/src/keri/app/agenting.py

@@ -27,9 +27,23 @@ logger = help.ogler.getLogger()
 
 
 class Receiptor(doing.DoDoer):
+    """
+    Receiptor is a parent task orchestrating both initial receipt retrieval of KEL events and
+    subsequent retrieval of receipts for specific events based on queries.
+    """
 
     def __init__(self, hby, msgs=None, gets=None, cues=None):
+        """
+        Initialize the Receiptor and create doers for processing and retrieving witness receipts.
 
+        Parameters:
+            hby (Habery): Habery to pull identifiers and witnesses for those identifiers from
+            msgs (Deck): KEL event messages to publish to witnesses for receipting
+                Messages should have {"pre": <str>, "sn": <int>, "auths": <dict>}
+            gets (Deck): query messages of KEL events to retrieve receipts from witnesses for
+                Messages should have {"pre": <str>, "sn": <int>}
+            cues (Deck): outgoing cues of successful messages; currently the messages placed here are not used
+        """
         self.msgs = msgs if msgs is not None else decking.Deck()
         self.gets = gets if gets is not None else decking.Deck()
         self.cues = cues if cues is not None else decking.Deck()
@@ -41,11 +55,11 @@ class Receiptor(doing.DoDoer):
         super(Receiptor, self).__init__(doers=doers)
 
     def receipt(self, pre, sn=None, auths=None):
-        """ Returns a generator for witness receipting
+        """Returns a generator performing witness receipting of KEL events.
 
         The returns a generator that will submit the designated event to witnesses for receipts using
-        the synchronous witness API, then propogate the receipts to each of the other witnesses.
-
+        the synchronous witness API, then propagate the receipts to each of the other witnesses.
+        Delegates to .catchup to catch up any new witnesses to the current state of the KEL.
 
         Parameters:
             pre (str): qualified base64 identifier to gather receipts for
@@ -54,7 +68,6 @@ class Receiptor(doing.DoDoer):
 
         Returns:
             list: identifiers of witnesses that returned receipts.
-
         """
         auths = auths if auths is not None else dict()
         if pre not in self.hby.prefixes:
@@ -87,6 +100,7 @@ class Receiptor(doing.DoDoer):
             except (kering.MissingEntryError, gaierror) as e:
                 logger.error(f"unable to create http client for witness {wit}: {e}")
 
+        # send to each witness and gather receipts
         rcts = dict()
         for wit, client in clients.items():
             headers = dict()
@@ -110,9 +124,10 @@ class Receiptor(doing.DoDoer):
             else:
                 print(f"invalid response {rep.status} from witnesses {wit}")
 
+        # send retrieved receipts to all other witnesses
         for wit in rcts:
-            ewits = [w for w in rcts if w != wit]
-            wigs = [sig for w, sig in rcts.items() if w != wit]
+            ewits = [w for w in rcts if w != wit] # get complement of all other witnesses
+            wigs = [sig for w, sig in rcts.items() if w != wit] # all other witness signatures
 
             msg = bytearray()
             if ser.ked['t'] in (coring.Ilks.icp, coring.Ilks.dip):  # introduce new witnesses
@@ -141,18 +156,15 @@ class Receiptor(doing.DoDoer):
         return rcts.keys()
 
     def get(self, pre, sn=None):
-        """ Returns a generator for witness querying
-
-        The returns a generator that will request receipts for event identified by pre and sn
+        """
+        Queries a random witness for the receipt of the event at the sequence number for a prefix.
 
+        Returns:
+             a generator requesting receipts for event identified by pre and sn
 
         Parameters:
-            pre (str): qualified base64 identifier to gather receipts for
+            pre (str): qualified base64 identifier to gather a receipt for
             sn: (Optiona[int]): sequence number of event to gather receipts for, latest is used if not provided
-
-        Returns:
-            list: identifiers of witnesses that returned receipts.
-
         """
         if pre not in self.hby.prefixes:
             raise kering.MissingEntryError(f"{pre} not a valid AID")
@@ -185,12 +197,16 @@ class Receiptor(doing.DoDoer):
         return rep.status == 200
 
     def catchup(self, pre, wit):
-        """ When adding a new Witness, use this method to catch the witness up to the current state of the KEL
+        """
+        A generator that catches up a target witness with the latest KEL state of a prefix.
+        When adding a new Witness use this method to catch the witness up to the current state of the KEL
+
+        Returns:
+            a generator that sends the KEL to the witness
 
         Parameters:
             pre (str): qualified base64 AID of the KEL to send
             wit (str): qualified base64 AID of the witness to send the KEL to
-
         """
         if pre not in self.hby.prefixes:
             raise kering.MissingEntryError(f"{pre} not a valid AID")
@@ -209,14 +225,17 @@ class Receiptor(doing.DoDoer):
 
     def witDo(self, tymth=None, tock=0.0, **kwa):
         """
-         Returns doifiable Doist compatibile generator method (doer dog) to process
-            .kevery and .tevery escrows.
+        A generator that obtains witness receipts for one key event message at a tyme by processing all messages in
+        the .msgs buffer and adds processed messages to cues. Catches up any new witnesses in "adds"
+        to the current state of the KEL using self.catchup.
+        Intended to be used with doify to create a generator Doer.
+        Delegates to the internal receipt generator function.
 
+        Returns:
+             a Hio generator function to be used as a Doer.
         Parameters:
-            tymth (function): injected function wrapper closure returned by .tymen() of
-                Tymist instance. Calling tymth() returns associated Tymist .tyme.
-            tock (float): injected initial tock value
-
+            tymth (function): function returning cycle time for configuring this Doer's cycle time.
+            tock (float): cycle time for this Doer, default is 0.0 seconds.
         Usage:
             add result of doify on this method to doers list
         """
@@ -238,14 +257,15 @@ class Receiptor(doing.DoDoer):
 
     def gitDo(self, tymth=None, tock=0.0, **kwa):
         """
-         Returns doifiable Doist compatibile generator method (doer dog) to process
-            .kevery and .tevery escrows.
+        A generator that obtains a witness receipts for key event messages specified in the query messages in the
+        .gets buffer
+        Intended to be used with doify to create a generator Doer.
 
+        Returns:
+            a Hio generator function to be used as a Doer.
         Parameters:
-            tymth (function): injected function wrapper closure returned by .tymen() of
-                Tymist instance. Calling tymth() returns associated Tymist .tyme.
-            tock (float): injected initial tock value
-
+            tymth (function): function returning cycle time for configuring this Doer's cycle time.
+            tock (float): cycle time for this Doer, default is 0.0 seconds.
         Usage:
             add result of doify on this method to doers list
         """
@@ -266,14 +286,13 @@ class Receiptor(doing.DoDoer):
 
 class WitnessReceiptor(doing.DoDoer):
     """
-    Sends messages to all current witnesses of given identifier (from hab) and waits
-    for receipts from each of those witnesses and propagates those receipts to each
+    Sends receipt messages to all current witnesses of given identifier (from hab), waits
+    for receipts from each of those witnesses, and propagates those receipts to each
     of the other witnesses after receiving the complete set.
 
     Removes all Doers and exits as Done once all witnesses have been sent the entire
     receipt set.  Could be enhanced to have a `once` method that runs once and cleans up
     and an `all` method that runs and waits for more messages to receipt.
-
     """
 
     def __init__(self, hby, msgs=None, cues=None, force=False, auths=None, **kwa):
@@ -283,10 +302,12 @@ class WitnessReceiptor(doing.DoDoer):
 
         Parameters:
             hby (Habery): Habitat of the identifier to receipt witnesses
-            msgs (Deck): incoming messages to publish to witnesses
-            cues (Deck): outgoing cues of successful messages
-            force (bool): True means to send witnesses all receipts even if we have a full compliment.
-
+            msgs (Deck): events to send the event and receipt to all witnesses
+                Messages should have {"pre": <str>, "sn": <int>, "auths": <dict>}
+            cues (Deck): outgoing cues of events confirmed as fully receipted
+                Messages have {"pre": <str>, "sn": <int>, "auths": <dict>}
+            force (bool): True means to send witnesses all receipts even if we have a full complement.
+            auths (dict): map of witness AIDs to (time,auth) tuples for providing TOTP auth for witnessing
         """
         self.hby = hby
         self.force = force
@@ -298,16 +319,18 @@ class WitnessReceiptor(doing.DoDoer):
 
     def receiptDo(self, tymth=None, tock=0.0, **kwa):
         """
-        Returns doifiable Doist compatible generator method (doer dog)
+        Sends events, their receipts, receipt signatures, delegation chain, and location record
+         URLs between witnesses in the set of current witnesses.
+
+        Returns:
+             a doifiable Hio generator to perform event and receipt sending.
 
         Usage:
             add result of doify on this method to doers list
 
         Parameters:
-            tymth is injected function wrapper closure returned by .tymen() of
-                Tymist instance. Calling tymth() returns associated Tymist .tyme.
-            tock is injected initial tock value
-
+            tymth (function): function returning cycle time for configuring this Doer's cycle time.
+            tock (float): cycle time for this Doer, default is 0.0 seconds.
         """
         self.wind(tymth)
         self.tock = tock
@@ -365,7 +388,7 @@ class WitnessReceiptor(doing.DoDoer):
                             break
                         _ = yield self.tock
 
-                # If we started with all our recipts, exit unless told to force resubmit of all receipts
+                # If we started with all our receipts, exit unless told to force resubmit of all receipts
                 if completed and not self.force:
                     self.cues.push(evt)
                     continue
@@ -423,28 +446,30 @@ class WitnessReceiptor(doing.DoDoer):
 
 class WitnessInquisitor(doing.DoDoer):
     """
-    Sends messages to all current witnesses of given identifier (from hab) and waits
-    for receipts from each of those witnesses and propagates those receipts to each
-    of the other witnesses after receiving the complete set.
+    Sends KEL and TEL query messages to different types of targets whether witnesses, controllers, or agents
+    based on the locally available endpoint role records for the query target.
+    Queries are performed by sending query messages either to a random witness or to the controller or agent that is the target of the query.
 
-    Removes all Doers and exits as Done once all witnesses have been sent the entire
-    receipt set.  Could be enhanced to have a `once` method that runs once and cleans up
-    and an `all` method that runs and waits for more messages to receipt.
+    Removes all Doers and exits as Done once the query target has been sent the query message
 
+    TODO: possibly rename based on the fact that multiple types of targets are supported (controller, agent, witness)
     """
 
-    def __init__(self, hby, reger=None, msgs=None, klas=None, **kwa):
+    def __init__(self, hby, msgs=None, klas=None, **kwa):
         """
-        For all msgs, select a random witness from Habitat's current set of witnesses
-        send the msg and process all responses (KEL replays, RCTs, etc)
+        Initialize the WitnessInquisitor with the given parameters.
 
         Parameters:
-            hby (Habitat): Habitat of the identifier to use to identify witnesses
-            msgs: is the message buffer to process and send to one random witness.
-
+            hby (Habery): Habery context to use to retrieve the source Hab for reading endpoint role records
+            klas (class): Type of messenger to use to send messages; defaults to HTTPMessenger; currently unused
+            msgs (decking.Deck): query message buffer to be sent to the target or a random witness
+        Attributes:
+            hby (Habery): Habery context to use to retrieve the source Hab for reading endpoint role records
+            klas (class): Type of messenger to use to send messages; defaults to HTTPMessenger; currently unused
+            msgs (decking.Deck): query message buffer to be sent to the target or a random witness
+            sent (decking.Deck): buffer for sent messages to track sent queries
         """
         self.hby = hby
-        self.reger = reger
         self.klas = klas if klas is not None else HTTPMessenger
         self.msgs = msgs if msgs is not None else decking.Deck()
         self.sent = decking.Deck()
@@ -453,7 +478,11 @@ class WitnessInquisitor(doing.DoDoer):
 
     def msgDo(self, tymth=None, tock=1.0, **opts):
         """
-        Returns doifiable Doist compatible generator method (doer dog)
+        Signs and sends provided KEL and TEL query messages to query targets using HTTPMessenger or
+        TCPMessenger. Uses  a randomly selected witness if the query target is a witness, or uses
+        the specified controller or agent when a controller or agent is specified.
+
+        Returns a Hio generator function that runs until all messages in .msgs are processed.
 
         Usage:
             add result of doify on this method to doers list
@@ -527,21 +556,20 @@ class WitnessInquisitor(doing.DoDoer):
             yield self.tock
 
     def query(self, pre, r="logs", sn='0', fn='0', src=None, hab=None, anchor=None, wits=None, **kwa):
-        """ Create, sign and return a `qry` message against the attester for the prefix
+        """
+        Create a KEL query (`qry`) message against the attester for the prefix (`pre`) and place on the internal .msgs
+        queue for processing by the .msgDo doer. May also contain an anchor to use to locate a key event.
+        May specify the hab to use for signing and retrieving endpoint role records.
 
         Parameters:
-            src (str): qb64 identifier prefix of source of query
-            hab (Hab): Hab to use instead of src if provided
             pre (str): qb64 identifier prefix being queried for
             r (str): query route
             sn (str): optional specific hex str of sequence number to query for
             fn (str): optional specific hex str of sequence number to start with
-            anchor (Seal): anchored Seal to search for
+            src (str): qb64 identifier prefix of source of query
+            hab (Hab): Hab to use instead of src, if provided, to retrieve endpoint role records from and to perform signing
+            anchor (Seal): anchored Seal to search for in the query target
             wits (list) witnesses to query
-
-        Returns:
-            bytearray: signed query event
-
         """
         qry = dict(s=sn, fn=fn)
         if anchor is not None:
@@ -554,6 +582,20 @@ class WitnessInquisitor(doing.DoDoer):
         self.msgs.append(msg)
 
     def telquery(self, ri, src=None, i=None, r="tels", hab=None, pre=None, wits=None, **kwa):
+        """
+        Create a TEL Query message to search against a given registry, issuer, route, in the target
+        prefixe's (`pre`) records, and add that query message on the internal .msgs queue.
+        May specify the hab to use for signing and retrieving endpoint role records.
+
+        Parameters:
+            ri (str): qb64 identifier prefix of the registry being queried
+            src (str): qb64 identifier prefix of source of query
+            i (str): qb64 identifier prefix of the issuer of the registry being queried
+            r (str): query route
+            hab (Hab): Hab to use instead of src, if provided, to retrieve endpoint role records from and to perform signing
+            pre (str): qb64 identifier prefix of the target being queried
+            wits (list): witnesses to query
+        """
         qry = dict(ri=ri)
         msg = dict(src=src, pre=pre, target=i, r=r, wits=wits, q=qry)
         if hab is not None:
@@ -985,6 +1027,16 @@ class HTTPStreamMessenger(doing.DoDoer):
 
 
 def mailbox(hab, cid):
+    """
+    Finds and returns a mailbox, if any, based on the provided Mab and controller AID (cid).
+
+    Returns:
+        str | None: qb64 identifier prefix of the mailbox to use for the controller, or None if no mailbox found.
+
+    Parameters:
+        hab (Hab): Hab to use to look up witness URLs
+        cid (str): qb64 identifier prefix of controller to find mailbox for
+    """
     for (_, erole, eid), end in hab.db.ends.getItemIter(keys=(cid, kering.Roles.mailbox)):
         if end.allowed:
             return eid
@@ -1089,6 +1141,17 @@ def httpClient(hab, wit):
 
 
 def schemes(db, eids):
+    """
+    Creates a message bytearray of reply messages containing location records (URLs) and witness
+    signatures, if any, for a given list of authorized endpoint role AIDs (eids).
+
+    Returns:
+        a bytearray of reply messages and their signatures
+
+    Parameters:
+        db (Baser): Hab database used to retrieve location records and witness signatures
+        eids (list): list of endpoint role AIDs (eids) to retrieve location records and witness signatures for
+    """
     msgs = bytearray()
     for eid in eids:
         for scheme in kering.Schemes:

{keri-2.0.0.dev1 → keri-2.0.0.dev5}/src/keri/app/cli/commands/aid.py

@@ -9,21 +9,18 @@ import argparse
 from hio.base import doing
 
 from keri import help
-from keri.app.cli.common import existing
+from keri.app.cli.common import existing 
+
+from keri.app.cli.common.parsing import Parsery
 from keri.kering import ConfigurationError
 
 logger = help.ogler.getLogger()
 
-parser = argparse.ArgumentParser(description='Print the AID for a given alias')
-parser.set_defaults(handler=lambda args: handler(args),
-                    transferable=True)
-parser.add_argument('--name', '-n', help='keystore name and file location of KERI keystore', required=True)
-parser.add_argument('--base', '-b', help='additional optional prefix to file location of KERI keystore',
-                    required=False, default="")
+parser = argparse.ArgumentParser(description='Print the AID for a given alias', parents=[Parsery.keystore()]) 
+parser.set_defaults(handler=lambda args: handler(args))
+
 parser.add_argument('--alias', '-a', help='human readable alias for the new identifier prefix', default=None,
                     required=True)
-parser.add_argument('--passcode', '-p', help='21 character encryption passcode for keystore (is not saved)',
-                    dest="bran", default=None)  # passcode => bran
 
 
 def handler(args):

{keri-2.0.0.dev1 → keri-2.0.0.dev5}/src/keri/app/cli/commands/challenge/respond.py

@@ -8,19 +8,16 @@ import argparse
 from hio.base import doing
 
 from keri.app import habbing, forwarding, connecting
-from keri.app.cli.common import existing
+from keri.app.cli.common import existing 
+from keri.app.cli.common.parsing import Parsery
 from keri.app.habbing import GroupHab
 from keri.peer import exchanging
 
 parser = argparse.ArgumentParser(description='Respond to a list of challenge words by signing and sending an EXN '
-                                             'response')
+                                             'response',
+                                 parents=[Parsery.keystore()])
 parser.set_defaults(handler=lambda args: respond(args))
-parser.add_argument('--name', '-n', help='keystore name and file location of KERI keystore', required=True)
-parser.add_argument('--base', '-b', help='additional optional prefix to file location of KERI keystore',
-                    required=False, default="")
 parser.add_argument('--alias', '-a', help='human readable alias for the identifier to use for responding', default=None)
-parser.add_argument('--passcode', '-p', help='21 character encryption passcode for keystore (is not saved)',
-                    dest="bran", default=None)  # passcode => bran
 parser.add_argument('--words', '-d', help='JSON formatted array of words to sign, \'@\' allowed to load from a file',
                     action="store", required=True)
 parser.add_argument('--recipient', '-r', help='Contact alias of the AID to send the signed words to',

{keri-2.0.0.dev1 → keri-2.0.0.dev5}/src/keri/app/cli/commands/challenge/verify.py

@@ -14,21 +14,17 @@ from keri import help
 from keri.app import indirecting, challenging, connecting, signaling
 from keri.app.cli.commands.challenge.generate import generateWords
 from keri.app.cli.common import existing
+from keri.app.cli.common.parsing import Parsery
 from keri.help import helping
 from keri.peer import exchanging
 
 logger = help.ogler.getLogger()
 
 parser = argparse.ArgumentParser(description='Check mailbox for EXN challenge response messages and verify their '
-                                             'signatures and data against provided words and signer')
+                                             'signatures and data against provided words and signer',
+                                 parents=[Parsery.keystore()])
 parser.set_defaults(handler=lambda args: verify(args))
-parser.add_argument('--name', '-n', help='keystore name and file location of KERI keystore', required=True)
 parser.add_argument('--alias', '-a', help='Unused, kept for backwards compatibility', default=None)
-parser.add_argument('--base', '-b', help='additional optional prefix to file location of KERI keystore',
-                    required=False, default="")
-parser.add_argument('--passcode', '-p', help='21 character encryption passcode for keystore (is not saved)',
-                    dest="bran", default=None)  # passcode => bran
-
 parser.add_argument('--words', '-d', help='JSON formatted array of words to verfiy, \'@\' allowed to load from a file',
                     action="store", required=False)
 parser.add_argument('--generate', '-g', help="Generate words, print to stdout and wait for verification",

{keri-2.0.0.dev1 → keri-2.0.0.dev5}/src/keri/app/cli/commands/clean.py

@@ -9,6 +9,7 @@ from hio.base import doing
 
 from keri import help
 from keri.app.cli.common import existing
+from keri.app.cli.common.parsing import Parsery
 
 logger = help.ogler.getLogger()
 
@@ -24,22 +25,11 @@ def handler(args):
     return [clean]
 
 
-parser = argparse.ArgumentParser(description='Cleans and migrates a database and keystore')
-parser.set_defaults(handler=handler,
-                    transferable=True)
-
-# Parameters for basic structure of database
-parser.add_argument('--name', '-n', help='keystore name and file location of KERI keystore', required=True)
-parser.add_argument('--base', '-b', help='additional optional prefix to file location of KERI keystore',
-                    required=False, default="")
+parser = argparse.ArgumentParser(description='Cleans and migrates a database and keystore', 
+                                 parents=[Parsery.keystore()])
+parser.set_defaults(handler=handler)
 parser.add_argument('--temp', '-t', help='create a temporary keystore, used for testing', default=False)
 
-# Parameters for Manager creation
-# passcode => bran
-parser.add_argument('--passcode', '-p', help='21 character encryption passcode for keystore (is not saved)',
-                    dest="bran", default=None)
-
-
 class CleanDoer(doing.Doer):
 
     def __init__(self, args):

{keri-2.0.0.dev1 → keri-2.0.0.dev5}/src/keri/app/cli/commands/contacts/list.py

@@ -13,19 +13,14 @@ from hio.base import doing
 from keri import help, kering
 from keri.app import connecting
 from keri.app.cli.common import existing
+from keri.app.cli.common.parsing import Parsery
 from keri.kering import ConfigurationError
 
 logger = help.ogler.getLogger()
 
-parser = argparse.ArgumentParser(description='List existing contacts')
-parser.set_defaults(handler=lambda args: handler(args),
-                    transferable=True)
-parser.add_argument('--name', '-n', help='keystore name and file location of KERI keystore', required=True)
-parser.add_argument('--base', '-b', help='additional optional prefix to file location of KERI keystore',
-                    required=False, default="")
-parser.add_argument('--passcode', '-p', help='21 character encryption passcode for keystore (is not saved)',
-                    dest="bran", default=None)  # passcode => bran
-
+parser = argparse.ArgumentParser(description='List existing contacts', 
+                                 parents=[Parsery.keystore()])
+parser.set_defaults(handler=lambda args: handler(args))
 
 def handler(args):
     kwa = dict(args=args)

{keri-2.0.0.dev1 → keri-2.0.0.dev5}/src/keri/app/cli/commands/contacts/replace.py

@@ -12,19 +12,15 @@ from hio.base import doing
 from keri import help
 from keri.app import connecting
 from keri.app.cli.common import existing
+from keri.app.cli.common.parsing import Parsery
 from keri.kering import ConfigurationError
 
 logger = help.ogler.getLogger()
 
 # Could be expanded to provide arbitrary data if desired
-parser = argparse.ArgumentParser(description='Replace contact information for identifier prefix with alias information')
-parser.set_defaults(handler=lambda args: handler(args),
-                    transferable=True)
-parser.add_argument('--name', '-n', help='keystore name and file location of KERI keystore', required=True)
-parser.add_argument('--base', '-b', help='additional optional prefix to file location of KERI keystore',
-                    required=False, default="")
-parser.add_argument('--passcode', '-p', help='21 character encryption passcode for keystore (is not saved)',
-                    dest="bran", default=None)  # passcode => bran
+parser = argparse.ArgumentParser(description='Replace contact information for identifier prefix with alias information', 
+                                 parents=[Parsery.keystore()])
+parser.set_defaults(handler=lambda args: handler(args))
 parser.add_argument('--prefix', '-o', help='identifier prefix to replace contact information for', required=True)
 parser.add_argument('--alias', '-a', help='human readable alias for the contact', required=True)