feat: use SAID for long running operation oid instead of identifier p…

…refix (WebOfTrust#289)

* feat: use SAID for op oid instead of pre

* test: coverage on query endpoint and op metadata validation

* fix: revert optypes.submit (code shouldnt be included and also doesnt make sense given the impl in longrunning.py)

src/keria/app/agenting.py

@@ -1218,20 +1218,21 @@ def on_post(req, rep):
         pre = httping.getRequiredParam(body, "pre")
         qry = dict(pre=pre)
 
-        meta = dict()
+        oid = pre
         if "anchor" in body:
-            meta["anchor"] = body["anchor"]
+            qry["anchor"] = body["anchor"]
+            oid = f"{pre}.{body["anchor"]["d"]}"
         elif "sn" in body:
-            meta["sn"] = body["sn"]
+            qry["sn"] = body["sn"]
+            oid = f"{pre}.{body["sn"]}"
         else:  # Must reset key state so we know when we have a new update.
             for (keys, saider) in agent.hby.db.knas.getItemIter(keys=(pre,)):
                 agent.hby.db.knas.rem(keys)
                 agent.hby.db.ksns.rem((saider.qb64,))
                 agent.hby.db.ksns.rem((saider.qb64,))
 
-        qry.update(meta)
         agent.queries.append(qry)
-        op = agent.monitor.submit(pre, longrunning.OpTypes.query, metadata=meta)
+        op = agent.monitor.submit(oid, longrunning.OpTypes.query, metadata=qry)
 
         rep.status = falcon.HTTP_202
         rep.content_type = "application/json"

src/keria/app/aiding.py

@@ -552,7 +552,7 @@ def on_post(req, rep):
                     )
                 )
                 op = agent.monitor.submit(
-                    serder.pre, longrunning.OpTypes.group, metadata=dict(sn=0)
+                    serder.pre, longrunning.OpTypes.group, metadata=dict(pre=hab.pre, sn=0)
                 )
 
                 rep.content_type = "application/json"
@@ -622,7 +622,7 @@ def on_post(req, rep):
                     op = agent.monitor.submit(
                         hab.kever.prefixer.qb64,
                         longrunning.OpTypes.witness,
-                        metadata=dict(sn=0),
+                        metadata=dict(pre=hab.pre, sn=0),
                     )
                     rep.status = falcon.HTTP_202
                     rep.data = op.to_json().encode("utf-8")
@@ -632,7 +632,7 @@ def on_post(req, rep):
                     op = agent.monitor.submit(
                         hab.kever.prefixer.qb64,
                         longrunning.OpTypes.done,
-                        metadata=dict(response=serder.ked),
+                        metadata=dict(pre=hab.pre, response=serder.ked),
                     )
                     rep.data = op.to_json().encode("utf-8")
 
@@ -887,15 +887,15 @@ def rotate(agent, name, body):
                 )
             )
             op = agent.monitor.submit(
-                serder.pre, longrunning.OpTypes.group, metadata=dict(sn=serder.sn)
+                serder.said, longrunning.OpTypes.group, metadata=dict(pre=hab.pre, sn=serder.sn)
             )
 
             return op
 
         if hab.kever.delpre:
             agent.anchors.append(dict(alias=name, pre=hab.pre, sn=serder.sn))
             op = agent.monitor.submit(
-                hab.kever.prefixer.qb64,
+                serder.said,
                 longrunning.OpTypes.delegation,
                 metadata=dict(pre=hab.pre, sn=serder.sn),
             )
@@ -904,14 +904,14 @@ def rotate(agent, name, body):
         if hab.kever.wits:
             agent.witners.append(dict(serder=serder))
             op = agent.monitor.submit(
-                hab.kever.prefixer.qb64,
+                serder.said,
                 longrunning.OpTypes.witness,
-                metadata=dict(sn=serder.sn),
+                metadata=dict(pre=hab.pre, sn=serder.sn),
             )
             return op
 
         op = agent.monitor.submit(
-            hab.kever.prefixer.qb64,
+            serder.said,
             longrunning.OpTypes.done,
             metadata=dict(response=serder.ked),
         )
@@ -945,28 +945,27 @@ def interact(agent, name, body):
         if "group" in body:
             agent.groups.append(dict(pre=hab.pre, serder=serder, sigers=sigers))
             op = agent.monitor.submit(
-                serder.pre, longrunning.OpTypes.group, metadata=dict(sn=serder.sn)
+                serder.said, longrunning.OpTypes.group, metadata=dict(pre=hab.pre, sn=serder.sn)
             )
 
             return op
 
         if hab.kever.wits:
             agent.witners.append(dict(serder=serder))
             op = agent.monitor.submit(
-                hab.kever.prefixer.qb64,
+                serder.said,
                 longrunning.OpTypes.witness,
-                metadata=dict(sn=serder.sn),
+                metadata=dict(pre=hab.pre, sn=serder.sn),
             )
             return op
 
         op = agent.monitor.submit(
-            hab.kever.prefixer.qb64,
+            serder.said,
             longrunning.OpTypes.done,
             metadata=dict(response=serder.ked),
         )
         return op
-
-
+
     @staticmethod
     def submit_id(agent, name, body):
         hab = agent.hby.habByName(name)
@@ -976,9 +975,9 @@ def submit_id(agent, name, body):
         code = body.get("code")
 
         if hab.kever.wits:
-            agent.submits.append(dict(alias=name,code=code))
+            agent.submits.append(dict(alias=name, code=code))
             op = agent.monitor.submit(hab.kever.prefixer.qb64, longrunning.OpTypes.submit,
-                                      metadata=dict(alias=name,sn=hab.kever.sn))
+                                      metadata=dict(alias=name, sn=hab.kever.sn))
             return op
 
         raise falcon.HTTPBadRequest(title=f"invalid identifier submitted, {name} has no witnesses")

src/keria/app/credentialing.py

@@ -183,8 +183,8 @@ def on_post(self, req, rep, name):
         seqner = coring.Seqner(sn=ixn.sn)
         prefixer = coring.Prefixer(qb64=ixn.pre)
         agent.registrar.incept(hab, registry, prefixer=prefixer, seqner=seqner, saider=coring.Saider(qb64=ixn.said))
-        op = agent.monitor.submit(hab.kever.prefixer.qb64, longrunning.OpTypes.registry,
-                                  metadata=dict(anchor=anchor, depends=op))
+        op = agent.monitor.submit(registry.regk, longrunning.OpTypes.registry,
+                                  metadata=dict(pre=hab.kever.prefixer.qb64, anchor=anchor, depends=op))
 
         rep.status = falcon.HTTP_202
         rep.data = op.to_json().encode("utf-8")
@@ -604,7 +604,7 @@ def on_post(self, req, rep, name):
             agent.credentialer.validate(creder)
             agent.registrar.issue(regk, iserder, anc)
             agent.credentialer.issue(creder=creder, serder=iserder)
-            op = agent.monitor.submit(hab.kever.prefixer.qb64, longrunning.OpTypes.credential,
+            op = agent.monitor.submit(creder.said, longrunning.OpTypes.credential,
                                       metadata=dict(ced=creder.sad, depends=op))
 
         except kering.ConfigurationError as e:

src/keria/app/delegating.py

@@ -216,9 +216,9 @@ def on_post(self, req, rep, name):
 
         # successful approval returns the delegatee prefix
         teepre = approveDelegation(hab, anc)
-        adop = agent.monitor.submit(hab.kever.prefixer.qb64, longrunning.OpTypes.delegation,
-                                    metadata=dict(teepre=teepre, anchor=anc, depends=op))
-        
+        adop = agent.monitor.submit(anc["d"], longrunning.OpTypes.delegation,
+                                    metadata=dict(pre=hab.kever.prefixer.qb64, teepre=teepre, anchor=anc, depends=op))
+
         try:
             rep.status = falcon.HTTP_200
             rep.content_type = "application/json"

src/keria/app/grouping.py

@@ -195,7 +195,7 @@ def on_post(req, rep, name):
 
         agent.inceptGroup(pre=gid, mpre=mhab.pre, verfers=verfers, digers=digers)
         agent.groups.append(dict(pre=hab.pre, serder=serder, sigers=sigers, smids=smids, rmids=rmids))
-        op = agent.monitor.submit(serder.pre, longrunning.OpTypes.group, metadata=dict(sn=serder.sn))
+        op = agent.monitor.submit(serder.said, longrunning.OpTypes.group, metadata=dict(pre=serder.pre, sn=serder.sn))
 
         rep.content_type = "application/json"
         rep.status = falcon.HTTP_202

src/keria/app/ipexing.py

@@ -101,7 +101,7 @@ def sendAdmit(agent, hab, ked, sigs, rec):
         agent.exchanges.append(dict(said=serder.said, pre=hab.pre, rec=rec, topic='credential'))
         agent.admits.append(dict(said=ked['d'], pre=hab.pre))
 
-        return agent.monitor.submit(serder.pre, longrunning.OpTypes.exchange, metadata=dict(said=serder.said))
+        return agent.monitor.submit(serder.said, longrunning.OpTypes.exchange, metadata=dict(said=serder.said))
 
     @staticmethod
     def sendMultisigExn(agent, hab, ked, sigs, atc, rec):
@@ -151,7 +151,7 @@ def sendMultisigExn(agent, hab, ked, sigs, atc, rec):
         agent.exchanges.append(dict(said=serder.said, pre=hab.pre, rec=[admitked['a']['i']], topic="credential"))
         agent.admits.append(dict(said=admitked['d'], pre=hab.pre))
 
-        return agent.monitor.submit(serder.pre, longrunning.OpTypes.exchange, metadata=dict(said=serder.said))
+        return agent.monitor.submit(serder.said, longrunning.OpTypes.exchange, metadata=dict(said=serder.said))
 
 
 class IpexGrantCollectionEnd:
@@ -226,7 +226,7 @@ def sendGrant(agent, hab, ked, sigs, atc, rec):
         agent.exchanges.append(dict(said=serder.said, pre=hab.pre, rec=rec, topic='credential'))
         agent.grants.append(dict(said=ked['d'], pre=hab.pre, rec=rec))
 
-        return agent.monitor.submit(serder.pre, longrunning.OpTypes.exchange, metadata=dict(said=serder.said))
+        return agent.monitor.submit(serder.said, longrunning.OpTypes.exchange, metadata=dict(said=serder.said))
 
     @staticmethod
     def sendMultisigExn(agent, hab, ked, sigs, atc, rec):
@@ -273,7 +273,7 @@ def sendMultisigExn(agent, hab, ked, sigs, atc, rec):
         agent.exchanges.append(dict(said=serder.said, pre=hab.pre, rec=[grantRec], topic="credential"))
         agent.grants.append(dict(said=grant['d'], pre=hab.pre, rec=[grantRec]))
 
-        return agent.monitor.submit(serder.pre, longrunning.OpTypes.exchange, metadata=dict(said=serder.said))
+        return agent.monitor.submit(serder.said, longrunning.OpTypes.exchange, metadata=dict(said=serder.said))
 
 
 class IpexApplyCollectionEnd:
@@ -343,7 +343,7 @@ def sendApply(agent, hab, ked, sigs, rec):
         agent.hby.psr.parseOne(ims=bytearray(ims))
 
         agent.exchanges.append(dict(said=serder.said, pre=hab.pre, rec=rec, topic='credential'))
-        return agent.monitor.submit(serder.pre, longrunning.OpTypes.exchange, metadata=dict(said=serder.said))
+        return agent.monitor.submit(serder.said, longrunning.OpTypes.exchange, metadata=dict(said=serder.said))
 
     @staticmethod
     def sendMultisigExn(agent, hab, ked, sigs, atc, rec):
@@ -387,7 +387,7 @@ def sendMultisigExn(agent, hab, ked, sigs, atc, rec):
         agent.hby.psr.parseOne(ims=ims)
         agent.exchanges.append(dict(said=serder.said, pre=hab.pre, rec=[applyRec], topic="credential"))
 
-        return agent.monitor.submit(serder.pre, longrunning.OpTypes.exchange, metadata=dict(said=serder.said))
+        return agent.monitor.submit(serder.said, longrunning.OpTypes.exchange, metadata=dict(said=serder.said))
 
 
 class IpexOfferCollectionEnd:
@@ -457,7 +457,7 @@ def sendOffer(agent, hab, ked, sigs, atc, rec):
         agent.hby.psr.parseOne(ims=bytearray(ims))
 
         agent.exchanges.append(dict(said=serder.said, pre=hab.pre, rec=rec, topic='credential'))
-        return agent.monitor.submit(serder.pre, longrunning.OpTypes.exchange, metadata=dict(said=serder.said))
+        return agent.monitor.submit(serder.said, longrunning.OpTypes.exchange, metadata=dict(said=serder.said))
 
     @staticmethod
     def sendMultisigExn(agent, hab, ked, sigs, atc, rec):
@@ -505,7 +505,7 @@ def sendMultisigExn(agent, hab, ked, sigs, atc, rec):
         agent.hby.psr.parseOne(ims=ims)
         agent.exchanges.append(dict(said=serder.said, pre=hab.pre, rec=[offerRec], topic="credential"))
 
-        return agent.monitor.submit(serder.pre, longrunning.OpTypes.exchange, metadata=dict(said=serder.said))
+        return agent.monitor.submit(serder.said, longrunning.OpTypes.exchange, metadata=dict(said=serder.said))
 
 
 class IpexAgreeCollectionEnd:
@@ -574,7 +574,7 @@ def sendAgree(agent, hab, ked, sigs, rec):
         agent.hby.psr.parseOne(ims=bytearray(ims))
 
         agent.exchanges.append(dict(said=serder.said, pre=hab.pre, rec=rec, topic='credential'))
-        return agent.monitor.submit(serder.pre, longrunning.OpTypes.exchange, metadata=dict(said=serder.said))
+        return agent.monitor.submit(serder.said, longrunning.OpTypes.exchange, metadata=dict(said=serder.said))
 
     @staticmethod
     def sendMultisigExn(agent, hab, ked, sigs, atc, rec):
@@ -622,4 +622,4 @@ def sendMultisigExn(agent, hab, ked, sigs, atc, rec):
         agent.hby.psr.parseOne(ims=ims)
         agent.exchanges.append(dict(said=serder.said, pre=hab.pre, rec=[agreeRec], topic="credential"))
 
-        return agent.monitor.submit(serder.pre, longrunning.OpTypes.exchange, metadata=dict(said=serder.said))
+        return agent.monitor.submit(serder.said, longrunning.OpTypes.exchange, metadata=dict(said=serder.said))