Skip to content

Commit

Permalink
Update to contact list to account for non-backward compatible changes…
Browse files Browse the repository at this point in the history
… and to multisig update to account for KeyStateRecord changes.

Signed-off-by: pfeairheller <[email protected]>
  • Loading branch information
pfeairheller committed Apr 4, 2024
1 parent 636774f commit 258726d
Show file tree
Hide file tree
Showing 6 changed files with 18 additions and 11 deletions.
8 changes: 4 additions & 4 deletions Makefile
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@

.PHONY: build-keri
build-keri:
@docker buildx build --platform=linux/amd64 -f images/keripy.dockerfile --tag weboftrust/keri:1.1.10 .
@docker buildx build --platform=linux/arm64 -f images/keripy.dockerfile --tag weboftrust/keri:1.1.10-arm64 .
@docker buildx build --platform=linux/amd64 -f images/keripy.dockerfile --tag weboftrust/keri:1.1.11 .
@docker buildx build --platform=linux/arm64 -f images/keripy.dockerfile --tag weboftrust/keri:1.1.11-arm64 .

.PHONY: build-witness-demo
build-witness-demo:
@@docker buildx build --platform=linux/amd64 -f images/witness.demo.dockerfile --tag weboftrust/keri-witness-demo:1.1.10 .
@@docker buildx build --platform=linux/arm64 -f images/witness.demo.dockerfile --tag weboftrust/keri-witness-demo:1.1.10-arm64 .
@@docker buildx build --platform=linux/amd64 -f images/witness.demo.dockerfile --tag weboftrust/keri-witness-demo:1.1.11 .
@@docker buildx build --platform=linux/arm64 -f images/witness.demo.dockerfile --tag weboftrust/keri-witness-demo:1.1.11-arm64 .

.PHONY: publish-keri
publish-keri:
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ to get a version string similar to the following:
### Local installation - Docker build
Run `make build-keri` to build your docker image.

Then run `docker run --pull=never -it --entrypoint /bin/bash weboftrust/keri:1.1.10` and you can run `kli version` from within the running container to play with KERIpy.
Then run `docker run --pull=never -it --entrypoint /bin/bash weboftrust/keri:1.1.11` and you can run `kli version` from within the running container to play with KERIpy.

Make sure the image tag matches the version used in the `Makefile`.
We use `--pull=never` to ensure that docker does not implicitly pull a remote image and relies on the local image tagged during `make build-keri`.
Expand Down
2 changes: 1 addition & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@
from setuptools import find_packages, setup
setup(
name='keri',
version='1.1.10', # also change in src/keri/__init__.py
version='1.1.11', # 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",
Expand Down
2 changes: 1 addition & 1 deletion src/keri/__init__.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# -*- encoding: utf-8 -*-

__version__ = '1.1.10' # also change in setup.py
__version__ = '1.1.11' # also change in setup.py


11 changes: 9 additions & 2 deletions src/keri/app/cli/commands/contacts/list.py
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@

from hio import help
from hio.base import doing
from keri import kering

from keri.app import connecting
from keri.app.cli.common import existing
Expand Down Expand Up @@ -53,8 +54,14 @@ def list(tymth, tock=0.0, **opts):

challenges = []
for said in valid:
exn = hby.db.exns.get(keys=(said,))
challenges.append(dict(dt=exn.ked['dt'], words=exn.ked['a']['words']))
try:
exn = hby.db.exns.get(keys=(said,))
except kering.ValidationError:
val = hby.db.getVal(db=hby.db.exns.sdb, key=hby.db.exns._tokey((said,)))
d = json.loads(bytes(val).decode("utf-8"))
challenges.append(dict(dt=d['dt'], words=d['a']['words']))
else:
challenges.append(dict(dt=exn.ked['dt'], words=exn.ked['a']['words']))

c["challenges"] = challenges

Expand Down
4 changes: 2 additions & 2 deletions src/keri/app/cli/commands/multisig/update.py
Original file line number Diff line number Diff line change
Expand Up @@ -119,8 +119,8 @@ def updateDo(self, tymth, tock=0.0, **opts):
print("")

witstate = self.hab.db.ksns.get((saider.qb64,))
if witstate.sn != self.sn and witstate.ked['d'] != self.said:
print(f"Witness state ({witstate.sn}, {witstate.ked['d']}) does not match requested state.")
if int(witstate.s, 16) != self.sn and witstate.d != self.said:
print(f"Witness state ({witstate.s}, {witstate.d}) does not match requested state.")
self.remove(self.toRemove)

return
Expand Down

0 comments on commit 258726d

Please sign in to comment.