keri 1.2.0.dev2__tar.gz → 1.2.0.dev3__tar.gz

{keri-1.2.0.dev2/src/keri.egg-info → keri-1.2.0.dev3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: keri
-Version: 1.2.0.dev2
+Version: 1.2.0.dev3
 Summary: Key Event Receipt Infrastructure
 Home-page: https://github.com/WebOfTrust/keripy
 Author: Samuel M. Smith

{keri-1.2.0.dev2 → keri-1.2.0.dev3}/setup.py

@@ -37,7 +37,7 @@ from os.path import splitext
 from setuptools import find_packages, setup
 setup(
     name='keri',
-    version='1.2.0-dev2',  # also change in src/keri/__init__.py
+    version='1.2.0-dev3',  # 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",

keri-1.2.0.dev3/src/keri/__init__.py

@@ -0,0 +1,5 @@
+# -*- encoding: utf-8 -*-
+
+__version__ = '1.2.0-dev3'  # also change in setup.py
+
+

{keri-1.2.0.dev2 → keri-1.2.0.dev3}/src/keri/app/cli/commands/delegate/confirm.py

@@ -96,9 +96,8 @@ class ConfirmDoer(doing.DoDoer):
 
         while True:
             esc = self.escrowed()
-            for ekey, edig in esc:
-                pre, sn = dbing.splitKeySN(ekey)  # get pre and sn from escrow item
-                dgkey = dbing.dgKey(pre, bytes(edig))
+            for pre, sn, edig in esc:
+                dgkey = dbing.dgKey(pre, edig)
                 eraw = self.hby.db.getEvt(dgkey)
                 if eraw is None:
                     continue
@@ -204,6 +203,7 @@ class ConfirmDoer(doing.DoDoer):
 
                             print(f"Delegate {eserder.pre} {typ} event committed.")
 
+                        self.hby.db.delegables.rem(keys=(pre, sn))
                         self.remove(self.toRemove)
                         return True
 
@@ -213,12 +213,6 @@ class ConfirmDoer(doing.DoDoer):
 
     def escrowed(self):
         esc = []
-        key = ekey = b''  # both start same. when not same means escrows found
-        while True:  # break when done
-            for ekey, edig in self.hby.db.getPseItemsNextIter(key=key):
-                esc.append((ekey, edig))
-            if ekey == key:  # still same so no escrows found on last while iteration
-                break
-            key = ekey  # setup next while iteration, with key after ekey
-
+        for (pre, sn), edig in self.hby.db.delegables.getItemIter():
+            esc.append((pre, sn, edig))
         return esc

{keri-1.2.0.dev2 → keri-1.2.0.dev3}/src/keri/app/cli/commands/incept.py

@@ -137,16 +137,15 @@ class InceptDoer(doing.DoDoer):
                                     clear=False)
         self.endpoint = endpoint
         self.proxy = proxy
-        hby = existing.setupHby(name=name, base=base, bran=bran, cf=cf)
-        self.hbyDoer = habbing.HaberyDoer(habery=hby)  # setup doer
-        self.swain = delegating.Anchorer(hby=hby)
-        self.postman = forwarding.Poster(hby=hby)
-        self.mbx = indirecting.MailboxDirector(hby=hby, topics=['/receipt', "/replay", "/reply"])
+        self.hby = existing.setupHby(name=name, base=base, bran=bran, cf=cf)
+        self.hbyDoer = habbing.HaberyDoer(habery=self.hby)  # setup doer
+        self.swain = delegating.Anchorer(hby=self.hby, proxy=self.hby.habByName(self.proxy))
+        self.postman = forwarding.Poster(hby=self.hby)
+        self.mbx = indirecting.MailboxDirector(hby=self.hby, topics=['/receipt', "/replay", "/reply"])
         doers = [self.hbyDoer, self.postman, self.mbx, self.swain, doing.doify(self.inceptDo)]
 
         self.inits = kwa
         self.alias = alias
-        self.hby = hby
         super(InceptDoer, self).__init__(doers=doers)
 
     def inceptDo(self, tymth, tock=0.0):
@@ -169,7 +168,7 @@ class InceptDoer(doing.DoDoer):
         self.extend([witDoer, receiptor])
 
         if hab.kever.delpre:
-            self.swain.delegation(pre=hab.pre, sn=0, proxy=self.hby.habByName(self.proxy))
+            self.swain.delegation(pre=hab.pre, sn=0)
             print("Waiting for delegation approval...")
             while not self.swain.complete(hab.kever.prefixer, coring.Seqner(sn=hab.kever.sn)):
                 yield self.tock

{keri-1.2.0.dev2 → keri-1.2.0.dev3}/src/keri/app/cli/commands/multisig/join.py

@@ -21,47 +21,52 @@ from keri.vdr import verifying, credentialing
 logger = help.ogler.getLogger()
 
 parser = argparse.ArgumentParser(description='Join group multisig inception, rotation or interaction event.')
-parser.set_defaults(handler=lambda args: confirm(args))
+parser.set_defaults(handler=lambda args: join(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('--group', '-a', help='human-readable name for the multisig group identifier prefix', required=False, 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("--auto", "-Y", help="auto approve any delegation request non-interactively", action="store_true")
 
 
-def confirm(args):
-    """  Wait for and provide interactive confirmation of group multisig inception, rotation or interaction events
+def join(args):
+    """ Wait for and provide interactive confirmation of group multisig inception, rotation or interaction events
 
     Parameters:
-        args(Namespace): parsed arguements namespace object
+        args(Namespace): parsed arguments namespace object
 
     """
     name = args.name
     base = args.base
     bran = args.bran
     auto = args.auto
+    group = args.group
 
-    confirmDoer = ConfirmDoer(name=name, base=base, bran=bran, auto=auto)
+    joinDoer = JoinDoer(name=name, base=base, bran=bran, group=group, auto=auto)
 
-    doers = [confirmDoer]
+    doers = [joinDoer]
     return doers
 
 
-class ConfirmDoer(doing.DoDoer):
-    """  Doist doer capable of polling for group multisig events and prompting user for action
+class JoinDoer(doing.DoDoer):
+    """ Doist doer capable of polling for group multisig events and prompting user for action
 
     """
 
-    def __init__(self, name, base, bran, auto=False):
+    def __init__(self, name, base, bran, group, auto=False):
         """ Create doer for polling for group multisig events and either approve automatically or prompt user
 
         Parameters:
             name (str): database environment name
             base (str): database directory prefix
             bran (str): passcode to unlock keystore
-
+            group (str): human-readable name for the multisig identifier prefix
+            auto (bool): non-interactively auto approve any inception, rotation, interaction, or other event
+                         while using the default group of "default-group"
         """
+        self.group = group
         self.hby = existing.setupHby(name=name, base=base, bran=bran)
         self.rgy = credentialing.Regery(hby=self.hby, name=name, base=base)
         self.hbyDoer = habbing.HaberyDoer(habery=self.hby)  # setup doer
@@ -88,11 +93,11 @@ class ConfirmDoer(doing.DoDoer):
 
         doers = [self.hbyDoer, self.witq,  self.mbx, self.counselor, self.registrar, self.credentialer, self.postman]
         self.toRemove = list(doers)
-        doers.extend([doing.doify(self.confirmDo)])
+        doers.extend([doing.doify(self.joinDo)])
         self.auto = auto
-        super(ConfirmDoer, self).__init__(doers=doers)
+        super(JoinDoer, self).__init__(doers=doers)
 
-    def confirmDo(self, tymth, tock=0.0):
+    def joinDo(self, tymth, tock=0.0):
         """
         Parameters:
             tymth (function): injected function wrapper closure returned by .tymen() of
@@ -146,7 +151,7 @@ class ConfirmDoer(doing.DoDoer):
         self.remove(self.toRemove)
 
     def incept(self, attrs):
-        """ Incept group multisig
+        """ Join a group multisig inception event
 
         """
         said = attrs["d"]
@@ -177,8 +182,8 @@ class ConfirmDoer(doing.DoDoer):
         inits["isith"] = oicp.ked["kt"]
         inits["nsith"] = oicp.ked["nt"]
 
-        inits["estOnly"] = eventing.TraitCodex.EstOnly in oicp.ked["c"]
-        inits["DnD"] = eventing.TraitCodex.DoNotDelegate in oicp.ked["c"]
+        inits["estOnly"] = kering.TraitCodex.EstOnly in oicp.ked["c"]
+        inits["DnD"] = kering.TraitCodex.DoNotDelegate in oicp.ked["c"]
 
         inits["toad"] = oicp.ked["bt"]
         inits["wits"] = oicp.ked["b"]
@@ -196,17 +201,20 @@ class ConfirmDoer(doing.DoDoer):
 
         if approve:
             if self.auto:
-                alias = "test alias"
+                if self.group is None:
+                    group = "default-group"
+                else:
+                    group = self.group
             else:
                 while True:
-                    alias = input(f"\nEnter alias for new AID: ")
-                    if self.hby.habByName(alias) is not None:
-                        print(f"AID alias {alias} is already in use, please try again")
+                    group = input(f"\nEnter group name for new AID: ")
+                    if self.hby.habByName(group) is not None:
+                        print(f"AID group name {group} is already in use, please try again")
                     else:
                         break
 
             try:
-                ghab = self.hby.makeGroupHab(group=alias, mhab=mhab,
+                ghab = self.hby.makeGroupHab(group=group, mhab=mhab,
                                              smids=smids, rmids=rmids, **inits)
             except ValueError as e:
                 return False
@@ -393,19 +401,22 @@ class ConfirmDoer(doing.DoDoer):
                 ghab = self.hby.habs[pre]
             else:
                 if self.auto:
-                    alias = "test alias"
+                    if self.group is None:
+                        group = "default-group"
+                    else:
+                        group = self.group
                 else:
                     while True:
-                        alias = input(f"\nEnter alias for new AID: ")
-                        if self.hby.habByName(alias) is not None:
-                            print(f"AID alias {alias} is already in use, please try again")
+                        group = input(f"\nEnter group name for new AID: ")
+                        if self.hby.habByName(group) is not None:
+                            print(f"AID group name {group} is already in use, please try again")
                         else:
                             break
 
-                ghab = self.hby.joinGroupHab(pre, group=alias, mhab=mhab, smids=smids, rmids=rmids)
+                ghab = self.hby.joinGroupHab(pre, group=group, mhab=mhab, smids=smids, rmids=rmids)
 
             try:
-                ghab.rotate(serder=orot)
+                ghab.rotate(serder=orot, smids=smids, rmids=rmids)
             except ValueError:
                 return False
 

{keri-1.2.0.dev2 → keri-1.2.0.dev3}/src/keri/app/cli/commands/multisig/rotate.py

@@ -53,9 +53,9 @@ def rotateGroupIdentifier(args):
     """
 
     data = config.parseData(args.data) if args.data is not None else None
-
-    rotDoer = GroupMultisigRotate(name=args.name, base=args.base, alias=args.alias, smids=args.smids, rmids=args.rmids,
-                                  bran=args.bran, wits=args.witnesses, cuts=args.cuts, adds=args.witness_add,
+    hby = existing.setupHby(name=args.name, base=args.base, bran=args.bran)
+    rotDoer = GroupMultisigRotate(hby=hby, alias=args.alias, smids=args.smids, rmids=args.rmids,
+                                  wits=args.witnesses, cuts=args.cuts, adds=args.witness_add,
                                   isith=args.isith, nsith=args.nsith, toad=args.toad, data=data)
 
     doers = [rotDoer]
@@ -70,7 +70,7 @@ class GroupMultisigRotate(doing.DoDoer):
 
     """
 
-    def __init__(self, name, base, bran, alias, smids=None, rmids=None, isith=None, nsith=None,
+    def __init__(self, hby, alias, smids=None, rmids=None, isith=None, nsith=None,
                  toad=None, wits=None, cuts=None, adds=None, data: list = None):
 
         self.alias = alias
@@ -80,12 +80,12 @@ class GroupMultisigRotate(doing.DoDoer):
         self.smids = smids
         self.rmids = rmids
         self.data = data
+        self.hby = hby
 
         self.wits = wits if wits is not None else []
         self.cuts = cuts if cuts is not None else []
         self.adds = adds if adds is not None else []
 
-        self.hby = existing.setupHby(name=name, base=base, bran=bran)
         self.hbyDoer = habbing.HaberyDoer(habery=self.hby)  # setup doer
         notifier = Notifier(self.hby)
         mux = grouping.Multiplexor(self.hby, notifier=notifier)

{keri-1.2.0.dev2 → keri-1.2.0.dev3}/src/keri/app/cli/commands/rotate.py

@@ -151,7 +151,7 @@ class RotateDoer(doing.DoDoer):
 
         self.hby = existing.setupHby(name=name, base=base, bran=bran)
         self.hbyDoer = habbing.HaberyDoer(habery=self.hby)  # setup doer
-        self.swain = delegating.Anchorer(hby=self.hby)
+        self.swain = delegating.Anchorer(hby=self.hby, proxy=self.hby.habByName(self.proxy))
         self.postman = forwarding.Poster(hby=self.hby)
         self.mbx = indirecting.MailboxDirector(hby=self.hby, topics=['/receipt', "/replay", "/reply"])
         doers = [self.hbyDoer, self.mbx, self.swain, self.postman, doing.doify(self.rotateDo)]
@@ -198,7 +198,7 @@ class RotateDoer(doing.DoDoer):
                 auths[wit] = f"{code}#{helping.nowIso8601()}"
 
         if hab.kever.delpre:
-            self.swain.delegation(pre=hab.pre, sn=hab.kever.sn, proxy=self.hby.habByName(self.proxy))
+            self.swain.delegation(pre=hab.pre, sn=hab.kever.sn)
             print("Waiting for delegation approval...")
             while not self.swain.complete(hab.kever.prefixer, coring.Seqner(sn=hab.kever.sn)):
                 yield self.tock

{keri-1.2.0.dev2 → keri-1.2.0.dev3}/src/keri/app/delegating.py

@@ -47,50 +47,30 @@ class Anchorer(doing.DoDoer):
         self.proxy = proxy
 
         super(Anchorer, self).__init__(doers=[self.witq, self.witDoer, self.postman, doing.doify(self.escrowDo)],
-                                     **kwa)
+                                       **kwa)
 
     def delegation(self, pre, sn=None, proxy=None):
         if pre not in self.hby.habs:
             raise kering.ValidationError(f"{pre} is not a valid local AID for delegation")
 
+        if proxy is not None:
+            self.proxy = proxy
+
         # load the hab of the delegated identifier to anchor
         hab = self.hby.habs[pre]
         delpre = hab.kever.delpre  # get the delegator identifier
         if delpre not in hab.kevers:
             raise kering.ValidationError(f"delegator {delpre} not found, unable to process delegation")
 
-        dkever = hab.kevers[delpre]  # and the delegator's kever
         sn = sn if sn is not None else hab.kever.sner.num
 
         # load the event and signatures
         evt = hab.makeOwnEvent(sn=sn)
 
-        smids = []
-        if isinstance(hab, GroupHab):
-            phab = hab.mhab
-            smids = hab.smids
-        elif proxy is not None:
-            phab = proxy
-        elif hab.kever.sn > 0:
-            phab = hab
-        elif self.proxy is not None:
-            phab = self.proxy
-        else:
-            raise kering.ValidationError("no proxy to send messages for delegation")
-
         # Send exn message for notification purposes
-        exn, atc = delegateRequestExn(phab, delpre=delpre, evt=bytes(evt), aids=smids)
-
-        self.postman.send(hab=phab, dest=hab.kever.delpre, topic="delegate", serder=exn, attachment=atc)
-
         srdr = serdering.SerderKERI(raw=evt)
-        del evt[:srdr.size]
-        self.postman.send(hab=phab, dest=delpre, topic="delegate", serder=srdr, attachment=evt)
-
-        seal = dict(i=srdr.pre, s=srdr.snh, d=srdr.said)
-        self.witq.query(hab=phab, pre=dkever.prefixer.qb64, anchor=seal)
-
-        self.hby.db.dune.pin(keys=(srdr.pre, srdr.said), val=srdr)
+        self.witDoer.msgs.append(dict(pre=pre, sn=srdr.sn))
+        self.hby.db.dpwe.pin(keys=(srdr.pre, srdr.said), val=srdr)
 
     def complete(self, prefixer, seqner, saider=None):
         """ Check for completed delegation protocol for the specific event
@@ -139,8 +119,8 @@ class Anchorer(doing.DoDoer):
             yield 0.5
 
     def processEscrows(self):
-        self.processUnanchoredEscrow()
         self.processPartialWitnessEscrow()
+        self.processUnanchoredEscrow()
 
     def processUnanchoredEscrow(self):
         """
@@ -159,11 +139,10 @@ class Anchorer(doing.DoDoer):
                 couple = seqner.qb64b + dserder.saidb
                 dgkey = dbing.dgKey(kever.prefixer.qb64b, kever.serder.saidb)
                 self.hby.db.setAes(dgkey, couple)  # authorizer event seal (delegator/issuer)
-                self.witDoer.msgs.append(dict(pre=pre, sn=serder.sn))
 
                 # Move to escrow waiting for witness receipts
-                logger.info(f"Waiting for fully signed witness receipts for {serder.sn}")
-                self.hby.db.dpwe.pin(keys=(pre, said), val=serder)
+                logger.info(f"Delegation approval received, {serder.pre} confirmed")
+                self.hby.db.cdel.put(keys=(pre, coring.Seqner(sn=serder.sn).qb64), val=coring.Saider(qb64=serder.said))
                 self.hby.db.dune.rem(keys=(pre, said))
 
     def processPartialWitnessEscrow(self):
@@ -188,9 +167,33 @@ class Anchorer(doing.DoDoer):
                             witnessed = True
                     if not witnessed:
                         continue
-                logger.info(f"Witness receipts complete, {pre} confirmed.")
+                logger.info(f"Witness receipts complete, waiting for delegation approval.")
+                hab = self.hby.habs[pre]
+                delpre = hab.kever.delpre  # get the delegator identifier
+                dkever = hab.kevers[delpre]  # and the delegator's kever
+                smids = []
+                if isinstance(hab, GroupHab):
+                    phab = hab.mhab
+                    smids = hab.smids
+                elif self.proxy is not None:
+                    phab = self.proxy
+                else:
+                    raise kering.ValidationError("no proxy to send messages for delegation")
+
+                evt = hab.db.cloneEvtMsg(pre=serder.pre, fn=0, dig=serder.said)
+                exn, atc = delegateRequestExn(phab, delpre=delpre, evt=bytes(evt), aids=smids)
+
+                self.postman.send(hab=phab, dest=hab.kever.delpre, topic="delegate", serder=exn, attachment=atc)
+
+                srdr = serdering.SerderKERI(raw=evt)
+                del evt[:srdr.size]
+                self.postman.send(hab=phab, dest=delpre, topic="delegate", serder=srdr, attachment=evt)
+
+                seal = dict(i=srdr.pre, s=srdr.snh, d=srdr.said)
+                self.witq.query(hab=phab, pre=dkever.prefixer.qb64, anchor=seal)
+
                 self.hby.db.dpwe.rem(keys=(pre, said))
-                self.hby.db.cdel.put(keys=(pre, seqner.qb64), val=coring.Saider(qb64=serder.said))
+                self.hby.db.dune.pin(keys=(srdr.pre, srdr.said), val=srdr)
 
 
 def loadHandlers(hby, exc, notifier):

{keri-1.2.0.dev2 → keri-1.2.0.dev3}/src/keri/app/grouping.py

@@ -47,11 +47,7 @@ class Counselor(doing.DoDoer):
             saider (Saider): saider of event of group identifier
 
         """
-        evt = ghab.makeOwnEvent(sn=seqner.sn, allowPartiallySigned=True)
-        serder = serdering.SerderKERI(raw=evt)
-        del evt[:serder.size]
-
-        logger.info(f"Waiting for other signatures for {serder.pre}:{seqner.sn}...")
+        print(f"Waiting for other signatures for {prefixer.qb64}:{seqner.sn}...")
         return self.hby.db.gpse.add(keys=(prefixer.qb64,), val=(seqner, saider))
 
     def complete(self, prefixer, seqner, saider=None):

{keri-1.2.0.dev2 → keri-1.2.0.dev3}/src/keri/core/__init__.py

@@ -14,5 +14,4 @@ from .coring import (Matter, MtrDex, Number, NumDex, Dater, Texter,
 
 from .coring import Tholder
 from .indexing import Indexer, Siger, IdrDex, IdxSigDex
-from .signing import (Signer, Salter, Cipher, Encrypter, Decrypter,
-                      generateSigners, )
+from .signing import (Signer, Salter, Cipher, Encrypter, Decrypter, )

{keri-1.2.0.dev2 → keri-1.2.0.dev3}/src/keri/core/eventing.py

@@ -1709,7 +1709,6 @@ class Kever:
         pre = pre if pre is not None else self.prefixer.qb64
         return pre in self.groups  # groups
 
-
     def locallyContributedIndices(self, verfers: list[Verfer]):
         """Returns list of indices of public keys contributed by local members
         to the KEL with current signing keys represented by verfers
@@ -1723,19 +1722,11 @@ class Kever:
             indices list[int]: list of indices of keys contributed by local members
 
         """
-        indices = []
-
-        for i, verfer in enumerate(verfers):
-            if (couples := self.pubs.get(keys=(verfer.qb64,))) is None:
-                continue
-
-            for (prefixer, seqner) in couples:
-                if self.locallyOwned(prefixer.qb64):  # only member not group aid
-                    indices.append(i)
-                    break  # only need one local member to exclude signature
-
-        return indices
+        habord = self.db.habs.get(keys=(self.prefixer.qb64,))
+        kever = self.kevers[habord.mid]
 
+        idx = [verfer.qb64 for verfer in verfers].index(kever.verfers[0].qb64)
+        return [idx]
 
     def reload(self, state):
         """
@@ -2227,13 +2218,15 @@ class Kever:
         # compromised signature remotely to satisfy threshold.
 
         if not local and self.locallyMembered():  # is this Kever's pre a local group
-            if (indices := self.locallyContributedIndices(verfers)):
+            if indices := self.locallyContributedIndices(verfers):
                 for siger in list(sigers):  # copy so clean del on original elements
                     if siger.index in indices:
-                        del sigers[siger.index]
-                        self.cues.push(dict(kin="remoteMemberedSig",
-                                            serder=serder,
-                                              index=siger.index))
+                        sigers.remove(siger)
+                        if self.cues:
+                            self.cues.push(dict(kin="remoteMemberedSig",
+                                                serder=serder,
+                                                index=siger.index))
+
 
         # get unique verified sigers and indices lists from sigers list
         sigers, indices = verifySigs(raw=serder.raw, sigers=sigers, verfers=verfers)
@@ -2255,7 +2248,6 @@ class Kever:
                                              f"or locally witnessed event"
                                                  f" = {serder.ked}.")
 
-
         werfers = [Verfer(qb64=wit) for wit in wits]  # get witness public key verifiers
         # get unique verified wigers and windices lists from wigers list
         wigers, windices = verifySigs(raw=serder.raw, sigers=wigers, verfers=werfers)
@@ -2270,6 +2262,7 @@ class Kever:
                                         f" on sigs for {[siger.qb64 for siger in sigers]}"
                                         f" for evt = {serder.ked}.")
 
+
         # escrow if not fully signed vs prior next rotation threshold
         if serder.ilk in (Ilks.rot, Ilks.drt):  # rotation so check prior next threshold
             # prior next threshold in .ntholder and digers in .ndigers
@@ -2306,7 +2299,7 @@ class Kever:
 
         # short circuit witness validation when either locallyOwned or locallyWitnessed
         # otherwise must validate fully witnessed
-        if not (self.locallyOwned() or self.locallyWitnessed(wits=wits)):
+        if not (self.locallyOwned() or self.locallyMembered() or self.locallyWitnessed(wits=wits)):
             if wits:  # is witnessed
                 if toader.num < 1 or toader.num > len(wits):  # out of bounds toad
                     raise ValidationError(f"Invalid toad = {toader.num} for wits = {wits}")
@@ -2639,38 +2632,16 @@ class Kever:
                                                     f" delegation by {delpre} of"
                                                          f"event = {serder.ked}.")
 
-                # ToDo XXXX This logic moves to the Delegable escrow processing
-                # ToDo XXXX create process escrow for delegable events "dees."
-                #in order to get delegator approval
-                # any virtual delegation or sandboxing logic happens there
-                # create virtual anchor seal so local delegator can evaluate
-                # superseding logic with provisional virtual seal
-                #dkever = self.kevers[delpre]
-                #dseal = SealEvent(i=serder.pre, s=serder.snh, d=serder.said)
-                #dserder = interact(pre=dkever.prefixer.qb64,
-                                           #dig=dkever.serder.said,
-                                           #sn=dkever.sner.num + 1,
-                                           #data=[dseal._asdict()])
-                #delseqner = coring.Seqner(snh=dserder.snh)
-                #delsaider = coring.Saider(qb64=dserder.said)
-                # ToDo XXXX  need to cue task here  to approve delegation by generating
-                # an anchoring SealEvent of serder in delegators KEL
-                # may include MFA and or business logic for the delegator i.e. is local
-                # event that designates this controller as delegator triggers
-                # this cue to approave delegation
                 #self.cues.push(dict(kin="approveDelegation",
                                         #delegator=kever.delpre,
                                         #serder=serder))
 
-
             else:  # not local delegator so escrow
                 self.escrowPSEvent(serder=serder, sigers=sigers, wigers=wigers, local=local)
                 raise MissingDelegationError(f"No delegation seal for delegator "
                                          "{delpre} of evt = {serder.ked}.")
 
-        #ssn = validateSN(sn=delseqner.snh, inceptive=False)  # delseqner Number should already do this
         ssn = Number(num=delseqner.sn).validate(inceptive=False).sn
-        #ssn = sner.num sner is Number seqner is Seqner
         # ToDo XXXX need to replace Seqners with Numbers
 
         # get the dig of the delegating event. Using getKeLast ensures delegating

{keri-1.2.0.dev2 → keri-1.2.0.dev3}/src/keri/core/parsing.py

@@ -994,10 +994,10 @@ class Parser:
 
                     if cigars:
                         kvy.processAttachedReceiptCouples(serder, cigars,
-                                                    firner=firner, local=local)
+                                                          firner=firner, local=local)
                     if trqs:
                         kvy.processAttachedReceiptQuadruples(serder, trqs,
-                                                    firner=firner, local=local)
+                                                             firner=firner, local=local)
 
                 except AttributeError as ex:
                     raise kering.ValidationError("No kevery to process so dropped msg"

{keri-1.2.0.dev2 → keri-1.2.0.dev3}/src/keri/core/signing.py

@@ -25,44 +25,6 @@ ECDSA_256r1_SEEDBYTES = 32
 ECDSA_256k1_SEEDBYTES = 32
 
 
-# deprecated use Salter.signers instead
-def generateSigners(raw=None, count=8, transferable=True):
-    """Returns list of Signers for Ed25519
-
-    Deprecated, use Salter.signers instead.
-
-    Use this when simply need valid AIDs but not when need valid controller
-    contexts. In the latter case use openHby or openHab which create databases.
-
-    Parameters:
-        raw (bytes):  16 byte long salt cryptomatter from which seeds
-            for Signers in list are derived
-            random salt created if not provided
-        count is number of signers in list
-        transferable is boolean true means signer.verfer code is transferable
-                                non-transferable otherwise
-    """
-    if not raw:
-        raw = pysodium.randombytes(pysodium.crypto_pwhash_SALTBYTES)
-
-    signers = []
-    for i in range(count):
-        path = f"{i:x}"
-        # algorithm default is argon2id
-        seed = pysodium.crypto_pwhash(outlen=32,
-                                      passwd=path,
-                                      salt=raw,
-                                      opslimit=2,  # pysodium.crypto_pwhash_OPSLIMIT_INTERACTIVE,
-                                      memlimit=67108864,  # pysodium.crypto_pwhash_MEMLIMIT_INTERACTIVE,
-                                      alg=pysodium.crypto_pwhash_ALG_ARGON2ID13)
-
-        signers.append(Signer(raw=seed, transferable=transferable))
-
-    return signers
-
-
-
-
 class Signer(Matter):
     """
     Signer is Matter subclass with method to create signature of serialization

{keri-1.2.0.dev2 → keri-1.2.0.dev3}/src/keri/db/basing.py

@@ -949,7 +949,7 @@ class Baser(dbing.LMDBer):
         self.misfits = subing.IoSetSuber(db=self, subkey='mfes.')
 
         # delegable events escrows. events with local delegator that need approval
-        self.delegables = subing.CesrIoSetSuber(db=self, subkey='dees.', klas=coring.Diger)
+        self.delegables = subing.IoSetSuber(db=self, subkey='dees.')
 
         # events as ordered by first seen ordinals
         self.fons = subing.CesrSuber(db=self, subkey='fons.', klas=core.Number)
@@ -1500,9 +1500,6 @@ class Baser(dbing.LMDBer):
             atc.extend(coring.Counter(code=coring.CtrDex.SealSourceCouples,
                                       count=1).qb64b)
             atc.extend(couple)
-        elif self.kevers[pre].delegated:
-            if coring.SerderKERI(raw=raw).estive:
-                raise kering.MissingEntryError("Missing delegator anchor seal for dig={}.".format(dig))
 
         # add trans endorsement quadruples to attachments not controller
         # may have been originally key event attachments or receipted endorsements

{keri-1.2.0.dev2 → keri-1.2.0.dev3/src/keri.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: keri
-Version: 1.2.0.dev2
+Version: 1.2.0.dev3
 Summary: Key Event Receipt Infrastructure
 Home-page: https://github.com/WebOfTrust/keripy
 Author: Samuel M. Smith

keri-1.2.0.dev2/src/keri/__init__.py

@@ -1,5 +0,0 @@
-# -*- encoding: utf-8 -*-
-
-__version__ = '1.2.0-dev2'  # also change in setup.py
-
-