fix: group ixns skip unneeded approval check; OOBI resolve no longer re-escrows approved dip

Prior to this commit when performing OOBI resolution then any approved dip events were being re-added to the delegables escrow for another approval, which is incorrect because the dip was already approved. Adding a check during Kever.processEvent to look up the sequence number and digest of the seal fixes this.

And group interaction events do not need delegation approval and thus should not be sent to the delegables escrow. This PR puts a type check for dip and drt around the logic that adds items to the delegables delegation approval escrow.

There was also a third bug in the addition of dip and drt events to the delegables escrow. Only single sig events were being added to the escrow because the self.locallyDelegated() check was too restrictive and did not work for group multisig events. Adding the or self.locallyMembered(delpre) check loosened the check enough to work for group multisig events

Signed-off-by: Kent Bull <[email protected]>

Author: kentbull

src/keri/app/cli/commands/delegate/confirm.py

@@ -121,12 +121,10 @@ def confirmDo(self, tymth, tock=0.0):
                 if ilk in (coring.Ilks.dip,):
                     typ = "inception"
                     delpre = eserder.sad["di"]
-
                 elif ilk in (coring.Ilks.drt,):
                     typ = "rotation"
                     dkever = self.hby.kevers[eserder.pre]
                     delpre = dkever.delpre
-
                 else:
                     continue
 
@@ -170,11 +168,11 @@ def confirmDo(self, tymth, tock=0.0):
                             saider = self.hby.db.cgms.get(keys=(prefixer.qb64, sner.qb64))
                             if saider is not None:
                                 break
-
                             yield self.tock
 
-                        print(f"Delegate {eserder.pre} {typ} event committed.")
+                        print(f"Delegate {typ} event {eserder.pre} committed.")
 
+                        self.hby.db.delegables.rem(keys=(pre, sn), val=edig)
                         self.remove(self.toRemove)
                         return True
 
@@ -211,27 +209,23 @@ def confirmDo(self, tymth, tock=0.0):
                             while not witDoer.cues:
                                 _ = yield self.tock
 
-                        print(f'Delegagtor Prefix  {hab.pre}')
-                        print(f'\tDelegate {eserder.pre} {typ} Anchored at Seq. No.  {hab.kever.sner.num}')
+                        print(f'Delegagtor Prefix {hab.pre}')
+                        print(f'\tDelegate {typ} event {eserder.pre} Anchored at Seq. No. {hab.kever.sner.num}')
 
                         # wait for confirmation of fully commited event
                         if eserder.pre in self.hby.kevers:
                             self.witq.query(src=hab.pre, pre=eserder.pre, sn=eserder.sn)
-
                             while eserder.sn < self.hby.kevers[eserder.pre].sn:
                                 yield self.tock
-
-                            print(f"Delegate {eserder.pre} {typ} event committed.")
                         else:  # It should be an inception event then...
                             wits = [werfer.qb64 for werfer in eserder.berfers]
                             self.witq.query(src=hab.pre, pre=eserder.pre, sn=eserder.sn, wits=wits)
-
                             while eserder.pre not in self.hby.kevers:
                                 yield self.tock
 
-                            print(f"Delegate {eserder.pre} {typ} event committed.")
+                        print(f"Delegate {typ} event {eserder.pre} committed.")
 
-                        self.hby.db.delegables.rem(keys=(pre, sn))
+                        self.hby.db.delegables.rem(keys=(pre, sn), val=edig)
                         self.remove(self.toRemove)
                         return True
 

src/keri/core/eventing.py

@@ -2388,7 +2388,10 @@ def valSigsWigsDel(self, serder, sigers, verfers, tholder,
         # seal in this case can't be malicious since sourced locally.
         # Doesn't get to here until fully signed and witnessed.
 
-        if self.locallyDelegated(delpre) and not self.locallyOwned():  # local delegator
+        # should only run for delegated inception and rotation, not interaction. Ixn does not require approval.
+        if serder.ilk in (Ilks.dip, Ilks.drt) \
+                and (self.locallyDelegated(delpre) or self.locallyMembered(delpre)) \
+                and not self.locallyOwned():  # local delegator
             # must be local if locallyDelegated or caught above as misfit
             if delseqner is None or delsaider is None:  # missing delegation seal
                 # so escrow delegable. So local delegator can approve OOB.
@@ -3786,6 +3789,19 @@ def processEvent(self, serder, sigers, *, wigers=None,
 
         if pre not in self.kevers:  # first seen event for pre
             if ilk in (Ilks.icp, Ilks.dip):  # first seen and inception so verify event keys
+                # check to see if the dip has already been approved and if so look up delseqner and delsaider
+                if ilk == Ilks.dip:
+                    delpre = ked["di"]
+                    seal = dict(i=serder.pre, s=serder.snh, d=serder.said)
+                    # process dips as the delegator, not as the delegatee. Delegatee will not have the anchor dserder
+                    dserder = self.db.fetchLastSealingEventByEventSeal(pre=delpre,
+                                                                       seal=seal)
+                    if dserder is not None:  # found seal in dserder
+                        # only gets here for delegator
+                        delseqner = coring.Seqner(sn=dserder.sn)  # replace with found
+                        delsaider = coring.Saider(qb64=dserder.said)  # replace with found
+                    # No need to do anything if processing dip as delegatee
+
                 # kever init verifies basic inception stuff and signatures
                 # raises exception if problem
                 # otherwise adds to KEL