Update keripy to v1.1.32

.github/workflows/python-app-ci.yml

@@ -17,14 +17,14 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        os: [ macos-latest, ubuntu-latest ]
+        os: [ macos-13, ubuntu-latest ]
 
     steps:
       - uses: actions/checkout@v3
-      - name: Set up Python 3.10.4
+      - name: Set up Python 3.12.2
         uses: actions/setup-python@v2
         with:
-          python-version: 3.10.4
+          python-version: 3.12.2
       - name: Install dependencies
         run: |
           python -m pip install --upgrade pip
@@ -47,10 +47,10 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v3
-      - name: Set up Python 3.10.4
+      - name: Set up Python 3.12.2
         uses: actions/setup-python@v2
         with:
-          python-version: 3.10.4
+          python-version: 3.12.2
       - name: Install dependencies
         run: |
           python -m pip install --upgrade pip
@@ -68,10 +68,10 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v3
-      - name: Set up Python 3.10.4
+      - name: Set up Python 3.12.2
         uses: actions/setup-python@v2
         with:
-          python-version: 3.10.4
+          python-version: 3.12.2
       - name: Install dependencies
         run: |
           python -m pip install --upgrade pip

Makefile

@@ -1,16 +1,34 @@
 
 .PHONY: build-keri
-build-keri:
-	@docker buildx build --platform=linux/amd64 -f images/keripy.dockerfile --tag weboftrust/keri:1.1.6 .
 
-.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.6 .
+VERSION=1.1.33
 
-.PHONY: publish-keri
-publish-keri:
-	@docker push weboftrust/keri --all-tags
+define DOCKER_WARNING
+In order to use the multi-platform build enable the containerd image store
+The containerd image store is not enabled by default.
+To enable the feature for Docker Desktop:
+	Navigate to Settings in Docker Desktop.
+	In the General tab, check Use containerd for pulling and storing images.
+	Select Apply and Restart."
+endef
+
+build-keri: .warn
+	@docker build --platform=linux/amd64,linux/arm64 -f images/keripy.dockerfile -t weboftrust/keri:$(VERSION) .
+
+.PHONY: build-witness-demo
+build-witness-demo: .warn
+	@docker build --platform=linux/amd64,linux/arm64 -f images/witness.demo.dockerfile -t weboftrust/keri-witness-demo:1.1.10 .
 
 .PHONY: publish-keri-witness-demo
 publish-keri-witness-demo:
-	@docker push weboftrust/keri-witness-demo --all-tags
+	@docker push weboftrust/keri-witness-demo --all-tags
+
+publish-keri:
+	@docker push weboftrust/keri:$(VERSION)
+
+.warn:
+	@echo -e ${RED}"$$DOCKER_WARNING"${NO_COLOUR}
+
+RED="\033[0;31m"
+NO_COLOUR="\033[0m"
+export DOCKER_WARNING

README.md

@@ -26,7 +26,10 @@ 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 -it gleif/keri /bin/bash` 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.33` 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`.
 
 ### Dependencies
 #### Binaries

docs/keri_db.rst

@@ -13,6 +13,8 @@ keri.db.dbing
 .. automodule:: keri.db.dbing
     :members:
 
+The `KERI_LMDB_MAP_SIZE` environment variable can be used to set the size of the LMDB map. The default size is 4GB.
+
 keri.db.escrowing
 -----------------
 

images/keripy.dockerfile

@@ -1,38 +1,38 @@
-# Builder layer
-FROM python:3.10-alpine as builder
+ARG BASE=python:3.12.2-alpine3.19
 
-# Install compilation dependencies
-RUN apk --no-cache add \
-    bash \
+FROM ${BASE} AS builder
+
+RUN apk add --no-cache bash
+
+SHELL ["/bin/bash", "-c"]
+
+RUN apk add --no-cache \
+    curl \
+    build-base \
     alpine-sdk \
     libffi-dev \
     libsodium \
-    libsodium-dev
-
-SHELL ["/bin/bash", "-c"]
+    libsodium-dev    
 
-# Setup Rust for blake3 dependency build
-RUN curl https://sh.rustup.rs -sSf | bash -s -- -y
+RUN curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y
+ENV PATH="/root/.cargo/bin:${PATH}"
 
 WORKDIR /keripy
 
 RUN python -m venv venv
 
 ENV PATH=/keripy/venv/bin:${PATH}
 
-RUN pip install --upgrade pip && \
-    mkdir /keripy/src
+RUN pip install --upgrade pip
+RUN mkdir /keripy/src
 
-# Copy Python dependency files in
 COPY requirements.txt setup.py ./
-# Set up Rust environment and install Python dependencies
-# Must source the Cargo environment for the blake3 library to see
-# the Rust intallation during requirements install
-RUN . ${HOME}/.cargo/env && \
-    pip install -r requirements.txt
+
+RUN . ${HOME}/.cargo/env
+RUN pip install -r requirements.txt
 
 # Runtime layer
-FROM python:3.10.13-alpine3.18
+FROM ${BASE}
 
 RUN apk --no-cache add \
     bash \
@@ -44,7 +44,6 @@ WORKDIR /keripy
 COPY --from=builder /keripy /keripy
 COPY src/ src/
 
-ENV PATH=/keripy/venv/bin:${PATH}
-
+ENV PATH="/keripy/venv/bin:${PATH}"
 
 ENTRYPOINT [ "kli" ]

scripts/demo/basic/migrate-quadlet.sh

@@ -1,13 +1,14 @@
 #!/bin/bash
 
-kli migrate --name multisig1
-kli migrate --name multisig2
-kli migrate --name multisig3
-kli migrate --name multisig4
+kli migrate --name delegator --force
+kli migrate --name multisig1 --force
+kli migrate --name multisig2 --force
+kli migrate --name multisig3 --force
+kli migrate --name multisig4 --force
 
-kli migrate --name wil
-kli migrate --name wan
-kli migrate --name wes
-kli migrate --name wit
-kli migrate --name wub
-kli migrate --name wyz
+kli migrate --name wil --force
+kli migrate --name wan --force
+kli migrate --name wes --force
+kli migrate --name wit --force
+kli migrate --name wub --force
+kli migrate --name wyz --force

scripts/demo/basic/multisig-join.sh

@@ -0,0 +1,61 @@
+#!/bin/bash
+
+# WITNESSES
+# To run the following scripts, open another console window and run:
+# $ kli witness demo
+
+kli init --name multisigj1 --salt 0ACDEyMzQ1Njc4OWxtbm9aBc --nopasscode --config-dir "${KERI_SCRIPT_DIR}" --config-file demo-witness-oobis
+kli incept --name multisigj1 --alias multisigj1 --file ${KERI_DEMO_SCRIPT_DIR}/data/multisig-1-sample.json
+
+kli init --name multisigj2 --salt 0ACDEyMzQ1Njc4OWdoaWpsaw --nopasscode --config-dir "${KERI_SCRIPT_DIR}" --config-file demo-witness-oobis
+kli incept --name multisigj2 --alias multisigj2 --file ${KERI_DEMO_SCRIPT_DIR}/data/multisig-2-sample.json
+
+kli oobi resolve --name multisigj1 --oobi-alias multisigj2 --oobi http://127.0.0.1:5642/oobi/EKJ6tNVUGbdaiwx2nWDCFXG-_PY_AzESOcoKlm0kRNP3/witness/BBilc4-L3tFUnfM_wJr4S4OJanAv_VmF_dJNN6vkf2Ha
+kli oobi resolve --name multisigj2 --oobi-alias multisigj1 --oobi http://127.0.0.1:5642/oobi/EFY7MixHb0so4WFFHw6btOPc5qeeWfPm7v5MJWcdcbyG/witness/BBilc4-L3tFUnfM_wJr4S4OJanAv_VmF_dJNN6vkf2Ha
+
+PID_LIST=""
+
+kli multisig incept --name multisigj1 --alias multisigj1 --group multisig --file ${KERI_DEMO_SCRIPT_DIR}/data/multisig-join-sample.json &
+pid=$!
+PID_LIST+=" $pid"
+
+kli multisig join --name multisigj2 --auto &
+pid=$!
+PID_LIST+=" $pid"
+
+wait $PID_LIST
+
+kli status --name multisigj1 --alias multisig
+
+kli rotate --name multisigj1 --alias multisigj1
+kli query --name multisigj2 --alias multisigj2 --prefix EFY7MixHb0so4WFFHw6btOPc5qeeWfPm7v5MJWcdcbyG
+kli rotate --name multisigj2 --alias multisigj2
+kli query --name multisigj1 --alias multisigj1 --prefix EKJ6tNVUGbdaiwx2nWDCFXG-_PY_AzESOcoKlm0kRNP3
+
+PID_LIST=""
+
+kli multisig rotate --name multisigj1 --alias multisig --smids EKJ6tNVUGbdaiwx2nWDCFXG-_PY_AzESOcoKlm0kRNP3 --smids EFY7MixHb0so4WFFHw6btOPc5qeeWfPm7v5MJWcdcbyG --isith '["1/2", "1/2"]' --nsith '["1/2", "1/2"]' --rmids EKJ6tNVUGbdaiwx2nWDCFXG-_PY_AzESOcoKlm0kRNP3 --rmids EFY7MixHb0so4WFFHw6btOPc5qeeWfPm7v5MJWcdcbyG &
+pid=$!
+PID_LIST+=" $pid"
+
+kli multisig join --name multisigj2 --auto &
+pid=$!
+PID_LIST+=" $pid"
+
+wait $PID_LIST
+
+kli status --name multisigj1 --alias multisig
+
+PID_LIST=""
+
+kli multisig interact --name multisigj1 --alias multisig --data '{"d": "potato"}' &
+pid=$!
+PID_LIST+=" $pid"
+
+kli multisig join --name multisigj2 --auto &
+pid=$!
+PID_LIST+=" $pid"
+
+wait $PID_LIST
+
+kli status --name multisigj1 --alias multisig

scripts/demo/basic/rotate-new-quartet.sh

@@ -7,8 +7,8 @@ kli query --name multisig1 --alias multisig1 --prefix EJccSRTfXYF6wrUVuenAIHzwcx
 
 # Perform rotation of mulisig AID from local kli AIDs that roll themselves out and the new AIDs in
 kli multisig rotate --name multisig1 --alias multisig \
-         --smids EKYLUMmNPZeEs77Zvclf0bSN5IN-mLfLpx2ySb-HDlk4:2 \
-         --smids EJccSRTfXYF6wrUVuenAIHzwcx3hJugeiJsEKmndi5q1:2 \
+         --smids EKYLUMmNPZeEs77Zvclf0bSN5IN-mLfLpx2ySb-HDlk4:1 \
+         --smids EJccSRTfXYF6wrUVuenAIHzwcx3hJugeiJsEKmndi5q1:1 \
          --smids EBFg-5SGDCv5YfwpkArWRBdTxNRUXU8uVcDKNzizOQZc:0 \
          --smids EBmW2bXbgsP3HITwW3FmITzAb3wVmHlxCusZ46vgGgP5:0 \
          --smids EL4RpdS2Atb2Syu5xLdpz9CcNNYoFUUDlLHxHD09vcgh:0 \
@@ -22,8 +22,8 @@ kli multisig rotate --name multisig1 --alias multisig \
 pid=$!
 PID_LIST="$pid"
 kli multisig rotate --name multisig2 --alias multisig \
-         --smids EKYLUMmNPZeEs77Zvclf0bSN5IN-mLfLpx2ySb-HDlk4:2 \
-         --smids EJccSRTfXYF6wrUVuenAIHzwcx3hJugeiJsEKmndi5q1:2 \
+         --smids EKYLUMmNPZeEs77Zvclf0bSN5IN-mLfLpx2ySb-HDlk4:1 \
+         --smids EJccSRTfXYF6wrUVuenAIHzwcx3hJugeiJsEKmndi5q1:1 \
          --smids EBFg-5SGDCv5YfwpkArWRBdTxNRUXU8uVcDKNzizOQZc:0 \
          --smids EBmW2bXbgsP3HITwW3FmITzAb3wVmHlxCusZ46vgGgP5:0 \
          --smids EL4RpdS2Atb2Syu5xLdpz9CcNNYoFUUDlLHxHD09vcgh:0 \