Skip to content

Commit 087f62f

Browse files
authored
Update to uses of seqno to ensure we are properly using hex string or int explicitly. (WebOfTrust#162)
Signed-off-by: pfeairheller <pfeairheller@gmail.com>
1 parent fadc608 commit 087f62f

File tree

4 files changed

+17
-10
lines changed

4 files changed

+17
-10
lines changed

src/keria/app/credentialing.py

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@
1313
from keri.app import signing
1414
from keri.app.habbing import SignifyGroupHab
1515
from keri.core import coring, scheming, serdering
16-
from keri.core.eventing import SealEvent
1716
from keri.db import dbing
1817

1918
from keria.core import httping, longrunning
@@ -755,8 +754,6 @@ def issue(self, regk, iserder, anc):
755754

756755
vcid = iserder.ked["i"]
757756
rseq = coring.Seqner(snh=iserder.ked["s"])
758-
rseal = SealEvent(vcid, rseq.snh, iserder.said)
759-
rseal = dict(i=rseal.i, s=rseal.s, d=rseal.d)
760757

761758
if not isinstance(hab, SignifyGroupHab): # not a multisig group
762759
seqner = coring.Seqner(sn=hab.kever.sner.num)
@@ -822,6 +819,16 @@ def revoke(self, regk, rserder, anc):
822819
return vcid, rseq.sn
823820

824821
def complete(self, pre, sn=0):
822+
""" Determine if registry event (inception, issuance, revocation, etc.) is finished validation
823+
824+
Parameters:
825+
pre (str): qb64 identifier of registry event
826+
sn (int): integer sequence number of regsitry event
827+
828+
Returns:
829+
bool: True means event has completed and is commited to database
830+
"""
831+
825832
seqner = coring.Seqner(sn=sn)
826833
said = self.rgy.reger.ctel.get(keys=(pre, seqner.qb64))
827834
return said is not None

src/keria/app/grouping.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ def on_post(req, rep, name):
6060

6161
# create seal for the proper location to find the signatures
6262
kever = hab.mhab.kever
63-
seal = eventing.SealEvent(i=hab.mhab.pre, s=hex(kever.lastEst.s), d=kever.lastEst.d)
63+
seal = eventing.SealEvent(i=hab.mhab.pre, s="{:x}".format(kever.lastEst.s), d=kever.lastEst.d)
6464

6565
ims = eventing.messagize(serder=serder, sigers=sigers, seal=seal)
6666
ims.extend(atc.encode("utf-8")) # add the pathed attachments

src/keria/app/ipexing.py

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ def sendAdmit(agent, hab, ked, sigs, rec):
7777

7878
# Now create the stream to send, need the signer seal
7979
kever = hab.kever
80-
seal = eventing.SealEvent(i=hab.pre, s=hex(kever.lastEst.s), d=kever.lastEst.d)
80+
seal = eventing.SealEvent(i=hab.pre, s="{:x}".format(kever.lastEst.s), d=kever.lastEst.d)
8181

8282
ims = eventing.messagize(serder=serder, sigers=sigers, seal=seal)
8383

@@ -118,7 +118,7 @@ def sendMultisigExn(agent, hab, ked, sigs, atc, rec):
118118

119119
# Now create the stream to send, need the signer seal
120120
kever = hab.kever
121-
seal = eventing.SealEvent(i=hab.pre, s=hex(kever.lastEst.s), d=kever.lastEst.d)
121+
seal = eventing.SealEvent(i=hab.pre, s="{:x}".format(kever.lastEst.s), d=kever.lastEst.d)
122122

123123
ims = eventing.messagize(serder=serder, sigers=sigers, seal=seal)
124124

@@ -185,7 +185,7 @@ def sendGrant(agent, hab, ked, sigs, atc, rec):
185185

186186
# Now create the stream to send, need the signer seal
187187
kever = hab.kever
188-
seal = eventing.SealEvent(i=hab.pre, s=hex(kever.lastEst.s), d=kever.lastEst.d)
188+
seal = eventing.SealEvent(i=hab.pre, s="{:x}".format(kever.lastEst.s), d=kever.lastEst.d)
189189

190190
ims = eventing.messagize(serder=serder, sigers=sigers, seal=seal)
191191
ims = ims + atc.encode("utf-8")
@@ -213,7 +213,7 @@ def sendMultisigExn(agent, hab, ked, sigs, atc, rec):
213213
holder = grant['a']['i']
214214
serder = serdering.SerderKERI(sad=grant)
215215
sigers = [coring.Siger(qb64=sig) for sig in sigs]
216-
seal = eventing.SealEvent(i=hab.pre, s=hex(hab.kever.lastEst.s), d=hab.kever.lastEst.d)
216+
seal = eventing.SealEvent(i=hab.pre, s="{:x}".format(hab.kever.lastEst.s), d=hab.kever.lastEst.d)
217217

218218
ims = eventing.messagize(serder=serder, sigers=sigers, seal=seal)
219219
ims = ims + atc.encode("utf-8")
@@ -227,7 +227,7 @@ def sendMultisigExn(agent, hab, ked, sigs, atc, rec):
227227

228228
# Now create the stream to send, need the signer seal
229229
kever = hab.kever
230-
seal = eventing.SealEvent(i=hab.pre, s=hex(kever.lastEst.s), d=kever.lastEst.d)
230+
seal = eventing.SealEvent(i=hab.pre, s="{:x}".format(kever.lastEst.s), d=kever.lastEst.d)
231231

232232
ims = eventing.messagize(serder=serder, sigers=sigers, seal=seal)
233233

src/keria/peer/exchanging.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ def on_post(req, rep, name):
6262

6363
# Now create the stream to send, need the signer seal
6464
kever = hab.kever
65-
seal = eventing.SealEvent(i=hab.pre, s=hex(kever.lastEst.s), d=kever.lastEst.d)
65+
seal = eventing.SealEvent(i=hab.pre, s="{:x}".format(kever.lastEst.s), d=kever.lastEst.d)
6666

6767
ims = eventing.messagize(serder=serder, sigers=sigers, seal=seal)
6868

0 commit comments

Comments
 (0)