diff --git a/Makefile b/Makefile index ab39a9a62..ddc8f7555 100644 --- a/Makefile +++ b/Makefile @@ -1,11 +1,11 @@ .PHONY: build-keri build-keri: - @docker buildx build --platform=linux/amd64 --no-cache -f images/keripy.dockerfile --tag weboftrust/keri:1.1.0 . + @docker buildx build --platform=linux/amd64 -f images/keripy.dockerfile --tag weboftrust/keri:1.1.0 . .PHONY: build-witness-demo build-witness-demo: - @@docker buildx build --platform=linux/amd64 --no-cache -f images/witness.demo.dockerfile --tag weboftrust/keri-witness-demo:1.1.0 . + @@docker buildx build --platform=linux/amd64 -f images/witness.demo.dockerfile --tag weboftrust/keri-witness-demo:1.1.0 . .PHONY: publish-keri publish-keri: diff --git a/src/keri/app/cli/commands/multisig/join.py b/src/keri/app/cli/commands/multisig/join.py index 257d11de0..f792f61a4 100644 --- a/src/keri/app/cli/commands/multisig/join.py +++ b/src/keri/app/cli/commands/multisig/join.py @@ -333,7 +333,7 @@ def rotate(self, attrs): prefixer = coring.Prefixer(qb64=ghab.pre) seqner = coring.Seqner(sn=serder.sn) - yield from self.startCounselor(ghab, prefixer, seqner, serder.saider) + yield from self.startCounselor(ghab, prefixer, seqner, coring.Saider(qb64=serder.said)) print() displaying.printIdentifier(self.hby, ghab.pre) diff --git a/src/keri/app/cli/commands/multisig/rotate.py b/src/keri/app/cli/commands/multisig/rotate.py index eb0c6eefe..04fcc3056 100644 --- a/src/keri/app/cli/commands/multisig/rotate.py +++ b/src/keri/app/cli/commands/multisig/rotate.py @@ -224,7 +224,7 @@ def rotateDo(self, tymth, tock=0.0, **opts): serder=exn, attachment=bytearray(ims)) - self.counselor.start(ghab=ghab, prefixer=prefixer, seqner=seqner, saider=rserder.saider) + self.counselor.start(ghab=ghab, prefixer=prefixer, seqner=seqner, saider=coring.Saider(qb64=rserder.said)) while True: saider = self.hby.db.cgms.get(keys=(ghab.pre, seqner.qb64)) diff --git a/src/keri/app/cli/commands/vc/create.py b/src/keri/app/cli/commands/vc/create.py index 507746276..0c1a9e743 100644 --- a/src/keri/app/cli/commands/vc/create.py +++ b/src/keri/app/cli/commands/vc/create.py @@ -225,7 +225,7 @@ def createDo(self, tymth, tock=0.0): self.registrar.issue(self.creder, iserder, aserder) acdc = signing.serialize(self.creder, coring.Prefixer(qb64=iserder.pre), coring.Seqner(sn=iserder.sn), - iserder.saider) + coring.Saider(qb64=iserder.said)) if isinstance(self.hab, habbing.GroupHab): smids = self.hab.db.signingMembers(pre=self.hab.pre) diff --git a/src/keri/app/delegating.py b/src/keri/app/delegating.py index 68ddbedad..f7c604935 100644 --- a/src/keri/app/delegating.py +++ b/src/keri/app/delegating.py @@ -190,7 +190,7 @@ def processPartialWitnessEscrow(self): continue print(f"Witness receipts complete, {pre} confirmed.") self.hby.db.dpwe.rem(keys=(pre, said)) - self.hby.db.cdel.put(keys=(pre, seqner.qb64), val=serder.saider) + self.hby.db.cdel.put(keys=(pre, seqner.qb64), val=coring.Saider(qb64=serder.said)) def loadHandlers(hby, exc, notifier): diff --git a/src/keri/core/eventing.py b/src/keri/core/eventing.py index 18a714d69..85b45f4ea 100644 --- a/src/keri/core/eventing.py +++ b/src/keri/core/eventing.py @@ -4494,7 +4494,7 @@ def processEscrowPartialSigs(self): srdr = self.db.findAnchoringEvent(pre=delpre, anchor=anchor) if srdr is not None: delseqner = coring.Seqner(sn=srdr.sn) - delsaider = srdr.saider + delsaider = coring.Saider(qb64=srdr.said) couple = delseqner.qb64b + delsaider.qb64b self.db.putPde(dgkey, couple) diff --git a/src/keri/vdr/credentialing.py b/src/keri/vdr/credentialing.py index cd4519bf2..f6a388ce2 100644 --- a/src/keri/vdr/credentialing.py +++ b/src/keri/vdr/credentialing.py @@ -443,7 +443,7 @@ def issue(self, said, dt=None): if self.noBackers: serder = eventing.issue(vcdig=said, regk=self.regk, dt=dt) else: - serder = eventing.backerIssue(vcdig=said, regk=self.regk, regsn=self.regi, regd=self.regser.saider.qb64, + serder = eventing.backerIssue(vcdig=said, regk=self.regk, regsn=self.regi, regd=self.regser.said, dt=dt) self.processEvent(serder=serder) @@ -473,7 +473,7 @@ def revoke(self, said, dt=None): if self.noBackers: serder = eventing.revoke(vcdig=vci, regk=self.regk, dig=iserder.said, dt=dt) else: - serder = eventing.backerRevoke(vcdig=vci, regk=self.regk, regsn=self.regi, regd=self.regser.saider.qb64, + serder = eventing.backerRevoke(vcdig=vci, regk=self.regk, regsn=self.regi, regd=self.regser.said, dig=iserder.said, dt=dt) self.processEvent(serder=serder) @@ -831,7 +831,8 @@ def issue(self, creder, serder): self.rgy.reger.cmse.put(keys=(creder.said, seqner.qb64), val=creder) try: - self.verifier.processCredential(creder=creder, prefixer=prefixer, seqner=seqner, saider=serder.saider) + self.verifier.processCredential(creder=creder, prefixer=prefixer, seqner=seqner, + saider=coring.Saider(qb64=serder.said)) except kering.MissingRegistryError: pass